更新用户增值税发票

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -797,14 +797,16 @@ public class SubmitServiceImpl implements SubmitService {
          * 计算运费
          */
         if (3 != orderParamBo.getCartType()){
-            // 机构用户 计算商品运费
-            Integer townId = baseMapper.getTownIdByAddressId(orderParamBo.getAddressId());
-            Map<String, Object> postageMap = productService.computePostage(orderParamBo.getUserId(), townId, productIdList);
-            // 运费标志：0包邮 -1到付 1遵循运费规则
-            Integer postageFlag = (Integer) postageMap.get("postageFlag");
-            Double postage = (Double) postageMap.get("postage");
-            if (!orderParamBo.getPostageFlag().equals(postageFlag) || MathUtil.compare(orderParamBo.getPostage(), postage) != 0) {
-                return ResponseJson.error("订单邮费不正确！", null);
+            // 机构用户 校验商品运费
+            if (orderParamBo.getPostageFlag() != -1) {
+                Integer townId = baseMapper.getTownIdByAddressId(orderParamBo.getAddressId());
+                Map<String, Object> postageMap = productService.computePostage(orderParamBo.getUserId(), townId, productIdList);
+                // 运费标志：0包邮 -1到付 1遵循运费规则
+                Integer postageFlag = (Integer) postageMap.get("postageFlag");
+                Double postage = (Double) postageMap.get("postage");
+                if (!orderParamBo.getPostageFlag().equals(postageFlag) || MathUtil.compare(orderParamBo.getPostage(), postage) != 0) {
+                    return ResponseJson.error("订单邮费不正确！", null);
+                }
             }
         }
         // 设置运费
@@ -1200,12 +1202,14 @@ public class SubmitServiceImpl implements SubmitService {
             if (null != userInvoice && null != userInvoice.getId()) {
                 // 更新
                 BeanUtils.copyProperties(orderInvoice, userInvoice);
+                userInvoice.setUserId(mainOrder.getUserId());
                 baseMapper.updateUserInvoiceByUserId(userInvoice);
                 log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>更新用户增值税发票(update[cm_user_invoiceinfo])userId：" + mainOrder.getUserId());
             } else {
                 // 新增
                 userInvoice = new InvoiceVo();
                 BeanUtils.copyProperties(orderInvoice, userInvoice);
+                userInvoice.setUserId(mainOrder.getUserId());
                 baseMapper.insertUserInvoiceByUserId(userInvoice);
                 log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户增值税发票(insert[cm_user_invoiceinfo])userId：" + mainOrder.getUserId());
             }