bugfix操作时间

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

@@ -1006,13 +1006,13 @@ public class ReceiptServiceImpl implements ReceiptService {
         receiptPo.setReceiptStatus(2);
         receiptPo.setConfirmType(receiptOperateDto.getConfirmType());
         // 非订单款项确认
-        if (2 == receipt.getReceiptType()) {
+        if (2 == receiptPo.getReceiptType()) {
             if (StringUtils.isNotBlank(receiptOperateDto.getNoOrderReason())) {
                 receiptPo.setNoOrderReason(receiptOperateDto.getNoOrderReason());
             }
         }
         // 订单款项
-        if (1 == receipt.getReceiptType()) {
+        if (1 == receiptPo.getReceiptType()) {
             if (StringUtils.isNotBlank(receiptOperateDto.getOrderIds())) {
                 String[] orderIDS = receiptOperateDto.getOrderIds().split(",");
                 // 关联一个订单
@@ -1239,34 +1239,34 @@ public class ReceiptServiceImpl implements ReceiptService {
         OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
         relation.setDelFlag(0);
         relation.setOrderId(receiptOperateDto.getShopOrderId());
-        relation.setReceiptId(receipt.getId());
+        relation.setReceiptId(receiptPo.getId());
         relation.setRelationType(1);
-        relation.setAssociateAmount(receipt.getReceiptAmount());
+        relation.setAssociateAmount(receiptPo.getReceiptAmount());
         baseMapper.insertOrderReceiptRelation(relation);
         /*
          * 保存供应商退款
          */
         RefundShopPo refundShop = new RefundShopPo();
         refundShop.setOperator(receiptUser.getId());
-        refundShop.setOperateTime(receipt.getConfirmDate());
+        refundShop.setOperateTime(receiptPo.getConfirmDate());
         refundShop.setRefundWay(4);
         refundShop.setShopId(shopOrder.getShopId());
-        refundShop.setRefundAmount(receipt.getReceiptAmount());
+        refundShop.setRefundAmount(receiptPo.getReceiptAmount());
         refundShop.setRefundBalanceAmount(0d);
-        refundShop.setRemark(receipt.getSmsContent());
+        refundShop.setRemark(receiptPo.getSmsContent());
         /*
                 退款：1建设银行7297, 2中信银行0897, 3中信银行7172, 4广发银行0115, 5广发银行5461, 6虚拟银行0000
                 付款：1建设银行7297、2广发银行0115、3中信银行7172、4中信银行0897、5中信银行0897-财付通、6中信银行0897-支付宝、7线上-支付宝、8线上-微信支付、9线上-快钱支付、10口头返佣、11广发银行5461、12PC-B2B网银、13PC-微信支付、14PC-支付宝、15小程序-微信支付、16余额抵扣、17PC-B2C网银
          */
-        if (1 == receipt.getPayType()) {
+        if (1 == receiptPo.getPayType()) {
             refundShop.setRefundType(1);
-        } else if (4 == receipt.getPayType() || 5 == receipt.getPayType() || 6 == receipt.getPayType()) {
+        } else if (4 == receiptPo.getPayType() || 5 == receiptPo.getPayType() || 6 == receiptPo.getPayType()) {
             refundShop.setRefundType(2);
-        } else if (3 == receipt.getPayType()) {
+        } else if (3 == receiptPo.getPayType()) {
             refundShop.setRefundType(3);
-        } else if (2 == receipt.getPayType()) {
+        } else if (2 == receiptPo.getPayType()) {
             refundShop.setRefundType(4);
-        } else if (11 == receipt.getPayType()) {
+        } else if (11 == receiptPo.getPayType()) {
             refundShop.setRefundType(5);
         } else {
             refundShop.setRefundType(6);
@@ -1278,8 +1278,8 @@ public class ReceiptServiceImpl implements ReceiptService {
         refundShopRecord.setShopId(refundShop.getShopId());
         refundShopRecord.setShopOrderId(shopOrder.getShopOrderId());
         refundShopRecord.setShopOrderNo(shopOrder.getShopOrderNo());
-        refundShopRecord.setRefundAmount(receipt.getReceiptAmount());
-        refundShopRecord.setRefundTime(receipt.getConfirmDate());
+        refundShopRecord.setRefundAmount(receiptPo.getReceiptAmount());
+        refundShopRecord.setRefundTime(receiptPo.getConfirmDate());
         receiptMapper.insertRefundShopRecord(refundShopRecord);
         return ResponseJson.success("关联供应商退款成功！", null);
     }
@@ -1325,7 +1325,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         }
         receiptMapper.updateReceipt(receiptPo);
         // 保存返佣收款关系和修改订单状态
-        saveRelationAndUpdateOrderStatus(receiptOperateDto.getShopOrderId(), receipt.getId());
+        saveRelationAndUpdateOrderStatus(receiptOperateDto.getShopOrderId(), receiptPo.getId());
         return ResponseJson.success("关联返佣款成功！", null);
     }
 
@@ -1576,7 +1576,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         balanceRecord.setAddDate(new Date());
                         balanceRecord.setAmount(relationItem.getAssociateAmount());
                         balanceRecord.setOrderId(order.getOrderId());
-                        balanceRecord.setReceiptId(receipt.getId());
+                        balanceRecord.setReceiptId(receiptPo.getId());
                         balanceRecord.setRemark("订单商品充值余额");
                         balanceRecord.setDelFlag(0);
                         // 保存 余额收支记录
@@ -1627,8 +1627,8 @@ public class ReceiptServiceImpl implements ReceiptService {
                     }
                 }
 
-                if (null != receipt.getConfirmType() && 3 == receipt.getConfirmType()) {
-                    Double money = receipt.getReceiptAmount() - totalAssociateAmount;
+                if (null != receiptPo.getConfirmType() && 3 == receiptPo.getConfirmType()) {
+                    Double money = receiptPo.getReceiptAmount() - totalAssociateAmount;
                     // 订单信息
                     OrderVo order = orderCommonMapper.getOrderByOrderId(listRelation.get(0).getOrderId());
                     Double userMoney = baseMapper.getUserMoney(order.getUserId());
@@ -1655,7 +1655,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                     balanceRecord.setAddDate(new Date());
                     balanceRecord.setAmount(money);
                     balanceRecord.setOrderId(order.getOrderId());
-                    balanceRecord.setReceiptId(receipt.getId());
+                    balanceRecord.setReceiptId(receiptPo.getId());
                     balanceRecord.setRemark("订单商品充值余额");
                     balanceRecord.setDelFlag(0);
                     // 保存 余额收支记录
@@ -1663,7 +1663,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                     baseMapper.updateUserMoney(userMoney, ableUserMoney, order.getUserId());
                     log.info("【线下收款】大额抹平金额退回账户>>>>>>>>>>>>>" + money);
                 }
-            } else if (4 == receiptStatus && 2 == receipt.getReceiptStatus()) {
+            } else if (4 == receiptStatus && 2 == receiptPo.getReceiptStatus()) {
                 //审核不通过
                 receiptPo.setReviewReason(reviewReason);
             } else {