Merge remote-tracking branch 'remotes/origin/developer' into developerC

# Conflicts:
#	src/main/java/com/caimei365/order/components/ProductService.java

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

@@ -1239,12 +1239,13 @@ public class PayOrderServiceImpl implements PayOrderService {
                         totalAmount4 = MathUtil.add(totalAmount4, account.getSplitAccount()).doubleValue();
                     }
                 }
-                addMaps(maps, totalAmount1, PayUtil.publicAccountNo);
+                //分账方不能重复,1,5都是信息，加一起分
+                double v = MathUtil.add(totalAmount1, totalAmount4).doubleValue();
+                addMaps(maps, v, PayUtil.publicAccountNo);
                 addMaps(maps, totalAmount2, PayUtil.privateAccountNo);
                 addMaps(maps, totalAmount3, PayUtil.commonInvoiceNo);
                 // 网络切信息
-                // addMaps(maps, totalAmount4, PayUtil.brokerage);
-                addMaps(maps, totalAmount4, PayUtil.publicAccountNo);
+//                addMaps(maps, totalAmount4, PayUtil.publicAccountNo);
                 String parameters = JSON.toJSONString(maps);
                 log.info("【延时分账】>>>>>>>>>>分账参数: " + parameters);
 

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

@@ -639,6 +639,12 @@ public class ReceiptServiceImpl implements ReceiptService {
             return ResponseJson.error("无权限操作！", null);
         }
         ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
+        //超级管理员可以看，其他人不能看已确认的单
+        if (null != receipt.getConfirmUserPermissionId()) {
+            if(1 == receiptUser.getUserType() && !receiptUser.getId().equals(receipt.getConfirmUserPermissionId())){
+                return ResponseJson.error("无权限操作！", null);
+            }
+        }
         if (null != receipt) {
             setReceiptDetail(receipt);
             List<OrderVo> orderList = new ArrayList<>();
@@ -2075,7 +2081,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 contentTime.add(group);
             }
             // 建设银行
-            if (Arrays.asList(1, 18, 19).contains(typeId)) {
+            if (Arrays.asList(1, 18, 19, 20).contains(typeId)) {
                 for (int i = 1; i < 5; i++) {
                     if (contentTime.get(i).length() < 2) {
                         String s = contentTime.get(i);