bugfix

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/caimei365/order/components/OssService.java

@@ -1,7 +1,6 @@
 package com.caimei365.order.components;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/caimei365/order/components/ProductService.java

@@ -1,7 +1,6 @@
 package com.caimei365.order.components;
 
 import com.caimei365.order.mapper.BaseMapper;
-import com.caimei365.order.mapper.OrderCommonMapper;
 import com.caimei365.order.model.dto.VipSkuPriceDto;
 import com.caimei365.order.model.po.*;
 import com.caimei365.order.model.vo.*;
@@ -17,7 +16,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -34,8 +32,6 @@ public class ProductService {
     private String domain;
     @Resource
     private BaseMapper baseMapper;
-    @Resource
-    private OrderCommonMapper commonMapper;
 
     /**
      * 设置商品图片及税费
@@ -461,7 +457,7 @@ public class ProductService {
         discernReceipt.setDelFlag(0);
         // 保存 收款记录
         baseMapper.insertDiscernReceipt(discernReceipt);
-        log.info(">>>>>>>>>>>保存识别款项(insert[cm_discern_receipt])id：" + discernReceipt.getId() + "，shopOrderId：" + s.getShopOrderId());
+        log.info(">>>>>>>>>>>保存识别款项(insert[cm_discern_receipt])id：" + discernReceipt.getId() + "，shopOrderId：" + order.getShopOrderId());
         // 收款项和订单关系表
         OrderReceiptRelationPo relation = new OrderReceiptRelationPo();
         relation.setReceiptId(discernReceipt.getId());
@@ -472,7 +468,7 @@ public class ProductService {
         relation.setDelFlag(0);
         // 保存 收款项和订单关系
         baseMapper.insertOrderReceiptRelation(relation);
-        log.info(">>>>>>>>>>>收款项和订单关系(insert[cm_receipt_order_relation])id：" + relation.getId() + "，shopOrderId：" + s.getShopOrderId());
+        log.info(">>>>>>>>>>>收款项和订单关系(insert[cm_receipt_order_relation])id：" + relation.getId() + "，shopOrderId：" + order.getShopOrderId());
         //保存余额到余额收支记录
         BalanceRecordPo balanceRecord = new BalanceRecordPo();
         balanceRecord.setUserId(order.getUserId());
@@ -486,6 +482,6 @@ public class ProductService {
         balanceRecord.setDelFlag(0);
         // 保存 余额收支记录
         baseMapper.insertBalanceRecord(balanceRecord);
-        log.info("【订单支付,余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])shopOrderId：" + s.getShopOrderId());
+        log.info("【订单支付,余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])shopOrderId：" + order.getShopOrderId());
     }
 }

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

@@ -46,8 +46,6 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.bouncycastle.asn1.x500.style.RFC4519Style.c;
-import static org.bouncycastle.asn1.x500.style.RFC4519Style.o;
 
 /**
  * Description