Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/UserEntity.java

@@ -120,4 +120,6 @@ public class UserEntity implements Serializable {
      * 用户信息失效时重定向的地址
      */
     private String redirectUrl;
+    // 用户编码
+    private String code;
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/oldusercenter/SsoUser.java

@@ -42,4 +42,7 @@ public class SsoUser implements Serializable {
     private Date lastLoginTime;
     private int boradAuth;
     private Integer userSource;
+
+    // 用户编码
+    private String code;
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java

@@ -466,6 +466,8 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     public UserEntity ssoUserTransUserEntity(SsoUser ssoUser) {
         UserEntity userEntity = new UserEntity();
+        //用户编码，用于推送票夹使用
+        userEntity.setCode(ssoUser.getCode());
         userEntity.setUserId(ssoUser.getUserId());
         userEntity.setUsername(ssoUser.getUsername());
         userEntity.setPassword(ssoUser.getPassword());

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -50,7 +50,6 @@ import com.dxhy.order.consumer.openapi.protocol.v5.invalid.ZffpxxV5;
 import com.dxhy.order.consumer.openapi.protocol.v5.order.DdfpxxV5;
 import com.dxhy.order.consumer.openapi.protocol.v5.order.DdfpzxxV5;
 import com.dxhy.order.consumer.openapi.protocol.v5.order.DdmxxxV5;
-import com.dxhy.order.consumer.openapi.protocol.v5.order.JdctxxV5;
 import com.dxhy.order.consumer.openapi.protocol.v6.order.QdTxxBO;
 import com.dxhy.order.consumer.openapi.service.CommonDisposeService;
 import com.dxhy.order.consumer.openapi.service.InterfaceServiceV5;
@@ -83,7 +82,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.security.NoSuchAlgorithmException;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -1368,7 +1366,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                     if(StrUtil.isBlank(f.getDJ())){
                         detail.setZZDJFP("");
                     }else {
-                        detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString());
+                        detail.setZZDJFP(f.getDJ());
+//                        detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString());
                     }
                     detail.setINVOICEDATE(ddfpxx.getKPRQ());
                     detail.setINVOICETYPE(ddfpxx.getFPLXDM());

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java

@@ -473,7 +473,14 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder
                     OrderInfo orderInfo = common.getOrderInfo();
                     String hjbhsje = orderInfo.getHjbhsje();
                     if (new BigDecimal(hjbhsje).compareTo(new BigDecimal(taxDiskLimit)) > 0) {
-                        limit = taxDiskLimit;
+                        //如果设置的含税限额小于税盘的限额（不含税）则按照客户设置的限额来
+                        if(new BigDecimal(customLimit).compareTo(new BigDecimal(taxDiskLimit)) < 0){
+                            hsbz = OrderInfoEnum.HSBZ_1.getKey();
+                            limit = customLimit;
+                        } else {
+                            hsbz = OrderInfoEnum.HSBZ_0.getKey();
+                            limit = taxDiskLimit;
+                        }
                     } else {
                         limit = customLimit;
                     }

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java

@@ -1258,6 +1258,7 @@ public class OrderCommonServiceImpl implements OrderCommonService {
         orderProcessInfo.setOriginDdh(processInfo.getDdh());
         orderProcessInfo.setOriginOrderId(processInfo.getOrderInfoId());
         orderProcessInfo.setKb(processInfo.getKb());
+        orderProcessInfo.setEntId(processInfo.getEntId());
         return orderProcessInfo;
     }
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsMxSap.java

@@ -63,7 +63,7 @@ public class FpkjtsMxSap {
      */
     private String ZHSJE;
     /**
-     * 单价(发票) 和成伟确认 这个单价是含税的，必传，含税金额/数量=含税单价 保留八位小数
+     * 单价(发票) 和张旭龙确认（20230501） 这个单价是含税的，必传，含税金额/数量=含税单价 保留八位小数
      */
     private String ZZDJFP;
     /**

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -196,6 +196,12 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
         OrderInvoiceInfo oderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList);
         if (oderInvoiceInfo != null) {
             OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList);
+            if(StringUtils.isNotBlank(oderInvoiceInfo.getFpqqlsh())){
+                OrderProcessInfo processInfo = orderInfoMapper.selectProcessByFpqqlsh(oderInvoiceInfo.getFpqqlsh(), shList);
+                if(processInfo != null){
+                    orderInfo.setYhbh(processInfo.getYhbh());
+                }
+            }
             List<OrderItemInfo> list = orderItemInfoMapper.selectOrderItemInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList);
             co.setOrderInvoiceInfo(oderInvoiceInfo);
             co.setOrderItemList(JsonUtils.getInstance().listBeanCopy(list, OrderItemInfo.class));