fix: bug修复

release
liufeilong 2 years ago
parent 3631282685
commit aeb3b04b7c
  1. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java
  2. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
  3. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java

@ -58,7 +58,7 @@ public class UserController {
public R getUserDetails() { public R getUserDetails() {
UserInfoQuery userInfoQuery = new UserInfoQuery(); UserInfoQuery userInfoQuery = new UserInfoQuery();
userInfoQuery.setBusinessDataType(OrderInfoEnum.ORDER_USER_INFO_BUSINESS_DATA_TYPE_2.getKey()); userInfoQuery.setBusinessDataType(OrderInfoEnum.ORDER_USER_INFO_BUSINESS_DATA_TYPE_2.getKey());
userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_2.getKey()); userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey());
R r = userInfoService.getUserInfo(userInfoQuery); R r = userInfoService.getUserInfo(userInfoQuery);

@ -186,7 +186,10 @@ public class InvoiceServiceImpl implements InvoiceService {
List<RuleSplitEntity> ruleSplitEntityList = ruleSplitService.queryRuleSplit(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId()); List<RuleSplitEntity> ruleSplitEntityList = ruleSplitService.queryRuleSplit(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId());
log.info("税号:{},用户ID:{},查询的拆分限额信息结果:{}", commonOrderInfo.getOrderInfo().getXhfNsrsbh(), log.info("税号:{},用户ID:{},查询的拆分限额信息结果:{}", commonOrderInfo.getOrderInfo().getXhfNsrsbh(),
pageInvoiceReq.getUserId(), JsonUtils.getInstance().toJsonString(ruleSplitEntityList)); pageInvoiceReq.getUserId(), JsonUtils.getInstance().toJsonString(ruleSplitEntityList));
String djce = ruleSplitEntityList.get(0).getDjce(); String djce = ConfigureConstant.STRING_0;
if(ruleSplitEntityList.size() != 0){
djce = StrUtil.isBlank(ruleSplitEntityList.get(0).getDjce())?ConfigureConstant.STRING_0:ruleSplitEntityList.get(0).getDjce();
}
BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs(); BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs();
if (abs.compareTo(new BigDecimal(djce)) > 0) { if (abs.compareTo(new BigDecimal(djce)) > 0) {
Map map = new HashMap(); Map map = new HashMap();

@ -173,7 +173,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
InterfaceRequestData data = new InterfaceRequestData(); InterfaceRequestData data = new InterfaceRequestData();
data.setId(DistributedKeyMaker.generateShotKey()); data.setId(DistributedKeyMaker.generateShotKey());
data.setYwlx(interfaceName); data.setYwlx(interfaceName);
data.setBatchId(poCommonRequestParam.getIS_INPUT().getBSKEY()); data.setBatchId(poCommonRequestParam.getIS_INPUT().getSAPKEY());
data.setRequestData(param); data.setRequestData(param);
data.setCreateTime(new Date()); data.setCreateTime(new Date());
interfaceRequestDataMapper.insert(data); interfaceRequestDataMapper.insert(data);

Loading…
Cancel
Save