Merge branch 'release' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java

@@ -132,6 +132,9 @@ public class CommodityServiceImpl implements CommodityService {
             if(commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntities.get(0), codeEntity, userId) == -1){
                 return R.error().put(OrderManagementConstant.DATA, "数据未进行修改,无需保存");
             }
+            if(StringUtils.isBlank(codeEntity.getYhzcbs())|| "0".equals(codeEntity.getYhzcbs())){
+                codeEntity.setZzstsgl("");
+            }
             codeEntity.setXhfNsrsbh(null);//不更新税号
             codeEntity.setModifyTime(new Date());
             codeEntity.setCreateTime(null);

order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml

@@ -300,7 +300,7 @@
             <if test="commodityCode.lslbs != null and commodityCode.lslbs != ''">
                 preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.zzstsgl != null and commodityCode.zzstsgl != ''">
+            <if test="commodityCode.zzstsgl != null">
                 zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR},
             </if>
             <if test="commodityCode.userId != null and commodityCode.userId != ''">

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java

@@ -81,7 +81,12 @@ public class GroupCommodityCodeController {
 
     @PostMapping("/sync")
     public R sync(@RequestBody @Validated SyncGroupCommodityDTO dto) {
-        return groupCommodityCodeService.syncGroupCommodityDTO(dto);
+        try {
+            return groupCommodityCodeService.syncGroupCommodityDTO(dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("系统异常，请联系管理员");
+        }
     }
 
     @RequestMapping("/uploadGroupCommodityDTO")

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

@@ -177,6 +177,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Resource
     private GsClientMapper gsClientMapper;
 
+    @Autowired
+    private BuyerMapper buyerMapper;
+
     @Resource
     private BaseService baseService;
 
@@ -1944,6 +1947,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                     OrderItemInfo item = new OrderItemInfo();
                     item.setId(itemInfo.getId());
                     item.setZnfm(ConfigureConstant.STRING_0);
+                    if (StringUtils.isBlank(itemInfo.getZxbm())) {
+                        item.setZxbm(commodityCodeEntity.getZxbm());
+                    }
                     items.add(item);
                 }
 

order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml

@@ -320,6 +320,9 @@
                 <if test="item.tswl != null and item.znfm != ''" >
                     tswl = #{item.tswl,jdbcType=VARCHAR},
                 </if>
+                <if test="item.zxbm != null and item.zxbm != ''" >
+                    zxbm = #{item.zxbm},
+                </if>
             </set>
             <where>
                 id = #{item.id,jdbcType=VARCHAR}