fix: 折扣行问题处理

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

@@ -613,6 +613,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                         }
 
                         item.setTswl(StrUtil.isBlank(commodityCodeEntity.getTswl())?"0":commodityCodeEntity.getTswl());
+                        item.setSpbm(commodityCodeEntity.getSpbm());
 
                     }
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3522,11 +3522,18 @@ public class BeanTransitionUtils {
                 }
                 ddmxxxBO.setZXBM(detail.getMATNR());
                 ddmxxxBO.setXMMC(detail.getZCPMC());
-                ddmxxxBO.setGGXH(detail.getCHARG());
+                if(ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){
-                ddmxxxBO.setDW(detail.getZSLDW());
+                    ddmxxxBO.setGGXH("");
-                ddmxxxBO.setSPSL(detail.getZZSL());
+                    ddmxxxBO.setDW("");
+                    ddmxxxBO.setSPSL("");
+                    ddmxxxBO.setDJ("");
+                }else {
+                    ddmxxxBO.setGGXH(detail.getCHARG());
+                    ddmxxxBO.setDW(detail.getZSLDW());
+                    ddmxxxBO.setSPSL(detail.getZZSL());
+                    ddmxxxBO.setDJ(detail.getZZDJ());
+                }
                 ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString());
-                ddmxxxBO.setDJ(detail.getZZDJ());
                 ddmxxxBO.setJE(detail.getZHSJE());
                 ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1);
                 ddmxxxBO.setSE(detail.getZZSE());