Merge remote-tracking branch 'origin/developer' into developerA

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

@@ -2194,26 +2194,6 @@ public class ReceiptServiceImpl implements ReceiptService {
         relation.setAssociateAmount(cmCost);
         baseMapper.insertOrderReceiptRelation(relation);
         if (1 == shopOrderById.getReceiptStatus()) {
-            // 为服务费造的线下凭证付款数据
-            ReceiptPo receiptPo = new ReceiptPo();
-            receiptPo.setPayWay(2);
-            receiptPo.setDelFlag(0);
-            receiptPo.setReceiptDate(DateUtils.getDateTime());
-            receiptPo.setUpdateDate(DateUtils.getDateTime());
-            receiptPo.setConfirmDate(DateUtils.getDateTime());
-            receiptPo.setPayType(31);
-            receiptPo.setReceiptType(1);
-            receiptPo.setReceiptStatus(3);
-            receiptPo.setConfirmUserPermissionId(receiptUserId);
-            receiptPo.setReceiptUserPermissionId(receiptUserId);
-            receiptPo.setReviewUserPermissionId(receiptUserId);
-            receiptPo.setReceiptAmount(shopOrderById.getNeedPayAmount());
-            receiptPo.setRebateRemarks("关联服务费，人工数据");
-            receiptMapper.insertReceipt(receiptPo);
-            relation.setRelationType(2);
-            relation.setReceiptId(receiptPo.getId());
-            relation.setAssociateAmount(shopOrderById.getNeedPayAmount());
-            baseMapper.insertOrderReceiptRelation(relation);
             // 修改订单状态为已付款
             receiptMapper.updateReceiptStatus(shopOrderId);
         }