Skip to content

C
cloud-platform
Commit 5952a493 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'master-invoice-modular' into dev

parents 7c885bcd a34221b7
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 60 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java
View file @ 5952a493
......@@ -120,6 +120,8 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
invoiceVo.setPurchaserTaxCode(newValue.getTaxCode());
invoiceVo.setRemark(newValue.getContentRemark());
invoiceVo.setOrderInvoiceId(newValue.getId());
invoiceVo.setUserId(appUserDTO.getUserid());
invoiceVo.setCreateBy(appUserDTO.getRealname());
invoiceVo.setOrders(list);
ObjectRestResponse objectRestResponse = thirdFeign.invoicing(invoiceVo);
if (!objectRestResponse.isRel()) {
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/vo/InvoiceVo.java
View file @ 5952a493
......@@ -2,7 +2,6 @@ package com.xxfc.platform.universal.entity.vo;
import com.xxfc.platform.universal.entity.OrderData;
import lombok.Data;
import lombok.ToString;
import java.util.List;
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/InvoiceController.java
View file @ 5952a493
package com.xxfc.platform.universal.controller;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
......@@ -11,10 +8,8 @@ import com.xxfc.platform.universal.entity.Invoice;
import com.xxfc.platform.universal.entity.vo.InvoiceVo;
import com.xxfc.platform.universal.service.InvoiceBiz;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
......@@ -29,10 +24,7 @@ import java.util.Map;
@RequestMapping("/invoice")
@Slf4j
public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
@Autowired
private UserAuthConfig userAuthConfig;
@Autowired
private UserAuthUtil userAuthUtil;
/**
* 根据开票代码获取税号
......@@ -78,15 +70,15 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
* @throws Exception
*/
@PostMapping("/invoicing")
public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo,HttpServletRequest request) throws Exception {
String token = request.getHeader("Authorization");
log.info("开票信息={}", invoiceVo);
IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(token);
invoiceVo.setUserId(Integer.valueOf(infoFromToken.getId()));
invoiceVo.setCreateBy(infoFromToken.getName());
public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo) throws Exception {
// String token = request.getHeader("Authorization");
// log.info("开票信息={}", invoiceVo);
// IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(token);
// invoiceVo.setUserId(Integer.valueOf(infoFromToken.getId()));
// invoiceVo.setCreateBy(infoFromToken.getName());
try {
String invoicing = baseBiz.Invoicing(invoiceVo,request);
String invoicing = baseBiz.Invoicing(invoiceVo);
return ObjectRestResponse.succ(invoicing);
} catch (BaseException e) {
log.error("开票错误信息={}", e);
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/InvoiceBiz.java
View file @ 5952a493
package com.xxfc.platform.universal.service;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.entity.OrderInvoice;
import com.xxfc.platform.order.feign.OrderFeign;
......@@ -24,9 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
......@@ -107,11 +105,10 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* 开票
*
* @param invoiceVo
* @param request
* @return
* @throws Exception
*/
public String Invoicing(InvoiceVo invoiceVo, HttpServletRequest request) throws Exception {
public String Invoicing(InvoiceVo invoiceVo) throws Exception {
//没有填写邮箱不需要进行推送
if (StringUtils.isBlank(invoiceVo.getPurchaserEmail())) {
pushMode = -1;
......@@ -140,7 +137,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
//调用第三方开票
String invoiceSerialNum = invoiceDao.Invoicing(invoice, orders);
insertInvoic(invoice, invoiceSerialNum, orders,request);
insertInvoic(invoice, invoiceSerialNum, orders);
return invoiceSerialNum;
}
......@@ -152,7 +149,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* @param orders
* @throws Exception
*/
public void insertInvoic(Invoice invoice, String invoiceSerialNum, List<OrderData> orders,HttpServletRequest request) throws Exception {
public void insertInvoic(Invoice invoice, String invoiceSerialNum, List<OrderData> orders) throws Exception {
invoice.setInvoiceSerialNum(invoiceSerialNum);
BigDecimal taxExcludedAmount = BigDecimal.ZERO;
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/invoice/impl/InvoiceDaoImpl.java
View file @ 5952a493
......@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.common.constant.RestCode;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.google.common.collect.Lists;
import com.xxfc.platform.universal.entity.Invoice;
......@@ -19,7 +18,6 @@ import org.springframework.context.annotation.Primary;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -82,17 +80,12 @@ public class InvoiceDaoImpl implements InvoiceDao {
// 唯一标识，由企业自己生成32位随机码
String senid = UUID.randomUUID().toString().replace("-", "");
String result = sdk.sendPostSyncRequest(url, senid, appKey, appSecret, getTokenJS(), taxnum, method, content);
try {
JSONObject jsonObject = JSON.parseObject(result);
List<Map<String, String>> mapList = (List<Map<String, String>>) jsonObject.get("result");
if (CollectionUtil.isNotEmpty(mapList)) {
return mapList;
}
throw new BaseException(result);
} catch (Exception e) {
throw new BaseException(result);
JSONObject jsonObject = JSON.parseObject(result);
List<Map<String, String>> mapList = (List<Map<String, String>>) jsonObject.get("result");
if (CollectionUtil.isNotEmpty(mapList)) {
return mapList;
}
return new ArrayList<>();
}
/**
......@@ -115,13 +108,9 @@ public class InvoiceDaoImpl implements InvoiceDao {
// 唯一标识，由企业自己生成32位随机码
String senid = UUID.randomUUID().toString().replace("-", "");
String result = sdk.sendPostSyncRequest(url, senid, appKey, appSecret, getTokenJS(), taxnum, method, content);
try {
JSONObject jsonObject = JSON.parseObject(result);
Map<String, String> resultMap = (Map<String, String>) jsonObject.get("result");
return resultMap.get("kpCode");
} catch (Exception e) {
throw new BaseException(result);
}
JSONObject jsonObject = JSON.parseObject(result);
Map<String, String> resultMap = (Map<String, String>) jsonObject.get("result");
return resultMap.get("kpCode");
}
......@@ -188,8 +177,9 @@ public class InvoiceDaoImpl implements InvoiceDao {
String jsonString = JSON.toJSONString(orderMap);
//调用第三方接口
String result = sdk.sendPostSyncRequest(invoiceUrl, senid, appKey2, appSecret2, token, taxnum2, method, jsonString);
log.info("第三方响应信息={}",result);
//把字符串json数据转换为map
try {
JSONObject jsonObject = JSON.parseObject(result);
Map<String, String> data = (Map<String, String>) jsonObject.get("result");
......@@ -227,7 +217,7 @@ public class InvoiceDaoImpl implements InvoiceDao {
List<Map<String, Object>> mapList = (List<Map<String, Object>>) jsonObject.get("result");
return mapList;
} catch (Exception e) {
throw new BaseException("发票请求流水号错误-");
throw new BaseException("发票请求流水号错误");
}
}
return null;
......@@ -245,7 +235,7 @@ public class InvoiceDaoImpl implements InvoiceDao {
/**
* 获取诺诺发票token
*/
private String getTokenFP() {
public String getTokenFP() {
return getToken(appKey2, appSecret2);
}
......@@ -263,20 +253,8 @@ public class InvoiceDaoImpl implements InvoiceDao {
redisTemplate.opsForValue().set(appKey, token, 23, TimeUnit.HOURS);
}
return token;
}
@PostConstruct
public void deleteTokenJS(){
System.out.println("deleteTokenJS");
setToken(appKey);
setToken(appKey2);
}
private void setToken(String appKey) {
redisTemplate.delete(appKey);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment