update:修正微信订单重复扣费问题

fengliang
1 parent 25c981b7
Showing 11 changed files with 154 additions and 9 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderQueryDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderStateNumberDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderStateNumbers.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/Order.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/OrderDeductionState.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/OrderState.java
etrade-order/src/main/java/com/diligrp/etrade/order/util/ParameterDetection.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryMapper.xml
@@ -72,6 +72,10 @@ public class OrderQueryDto extends BasePageQuery {
  
     /** 订单配送状态 (1待配送 2配送中 3已配送) */
     private Integer achieveState;
+    /**
+     * 配送方式
+     */
+    private Integer wayType;
  
     public Integer getVerifyState() {
         return verifyState;
@@ -3,8 +3,15 @@ package com.diligrp.etrade.order.domain;
 public class OrderStateNumberDto {
  
     private Integer state;
+
+    private Integer verifyState;
+
+    private Integer achieveState;
+
     private Integer number;
  
+    private Integer code;
+
     public Integer getState() {
         return state;
     }
@@ -20,4 +27,28 @@ public class OrderStateNumberDto {
     public void setNumber(Integer number) {
         this.number = number;
     }
+
+    public Integer getVerifyState() {
+        return verifyState;
+    }
+
+    public void setVerifyState(Integer verifyState) {
+        this.verifyState = verifyState;
+    }
+
+    public Integer getAchieveState() {
+        return achieveState;
+    }
+
+    public void setAchieveState(Integer achieveState) {
+        this.achieveState = achieveState;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
 }
@@ -18,6 +18,15 @@ public class OrderStateNumbers {
      */
     private Integer finished = 0;
  
+    /** 待核销 */
+    private Integer waitMapping = 0;
+
+    /** 待配送 */
+    private Integer waitSend = 0;
+
+    /** 待收货 */
+    private Integer waitReceive = 0;
+
     /**
      * 已取消
      */
@@ -67,4 +76,28 @@ public class OrderStateNumbers {
     public void setAll(Integer all) {
         this.all = all;
     }
+
+    public Integer getWaitMapping() {
+        return waitMapping;
+    }
+
+    public void setWaitMapping(Integer waitMapping) {
+        this.waitMapping = waitMapping;
+    }
+
+    public Integer getWaitSend() {
+        return waitSend;
+    }
+
+    public void setWaitSend(Integer waitSend) {
+        this.waitSend = waitSend;
+    }
+
+    public Integer getWaitReceive() {
+        return waitReceive;
+    }
+
+    public void setWaitReceive(Integer waitReceive) {
+        this.waitReceive = waitReceive;
+    }
 }
@@ -278,6 +278,8 @@ public class Order {
  
     /** 订单配送状态 */
     private Integer achieveState;
+    /** 扣减库存状态（1未扣减，2已扣减） */
+    private Integer stockDeductionState;
  
     public Integer getAchieveType() {
         return achieveType;
@@ -734,4 +736,12 @@ public class Order {
     public void setRelationId(Long relationId) {
         this.relationId = relationId;
     }
+
+    public Integer getStockDeductionState() {
+        return stockDeductionState;
+    }
+
+    public void setStockDeductionState(Integer stockDeductionState) {
+        this.stockDeductionState = stockDeductionState;
+    }
 }
 \ No newline at end of file
@@ -237,6 +237,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Transactional
     @Override
     public void deduct(Order order,Long operateId,String operateName) {
+        //检测是否扣减过，已扣减则不再继续扣减
+        if(order.getStockDeductionState()!=null&&order.getStockDeductionState().equals(OrderDeductionState.DEDUCT_FINISH.getCodeInteger())){
+            return ;
+        }
         List<ProductDto> realgoods = getProductDtoByOrderId(order.getId(),order.getMarketId(),OrderGoodState.NORMAL.getCodeInteger());
         Map<Long,ProductDto> deductGoods = new HashMap<>();
         for(ProductDto productDto :realgoods){
@@ -39,6 +39,9 @@ public class OrderQueryServiceImpl implements OrderQueryService {
     @Resource
     private OrderPaymentService orderPaymentService;
  
+    @Resource
+    private OrderDeliveryService orderDeliveryService;
+
     @Override
     public List<OrderStateNumberDto> queryOrderStateNumber(OrderQueryDto orderQueryDto) {
         return orderQueryMapper.queryOrderStateNumber(orderQueryDto);
@@ -104,6 +107,9 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             //获取交易单
             orderDetail.setOrderPaymentDto(orderPaymentService.getPaymenDtoByOrderId(orderDetail.getOrder().getId(),orderDetail.getOrder().getMarketId(),OrderPaymentState.FINISH_PAY.getCodeInteger()));
         }
+        if(orderDetail.getOrder().getAchieveType().equals(OrderAchieveType.SELLER_DELIVERY.getCodeInteger())){
+            orderDetail.setOrderDelivery(orderDeliveryService.selectOrderDeliveryByOrderCode(orderDetail.getOrder().getCode()));
+        }
         return orderDetail;
     }
  
@@ -60,6 +60,7 @@ import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
  
 /**
  * 订单主单服务实现
@@ -769,7 +770,6 @@ public class OrderServiceImpl implements OrderService {
             }
         }
  
-        List<OrderPayment> orderPaymentList = new ArrayList<>();
         WeChatPayTradeDto weChatPayTradeDto = new WeChatPayTradeDto();
         //效验店铺
         ShopVo shop = orderGoodsService.checkShop(orderWeChatPayBatch.getShopId());
@@ -810,8 +810,7 @@ public class OrderServiceImpl implements OrderService {
                         ,orderWeChatPayBatch.getPayerStoreCustomerId(),orderWeChatPayBatch.getPayerCustomerName(),orderWeChatPayBatch.getPayerPhone()
                         ,null,null,null,null,orderWeChatPayBatch.getOperateId(),orderWeChatPayBatch.getOperateName()
                         ,null,null,null,orderWeChatPayBatch.getCustomerAbbr(),weChatPayTradeBackDto.getPaymentId());
-                OrderPayVo payVo = orderPaymentService.createOrderPayment(order, orderPayDto, identityType,shop);
-                orderPaymentList.add(payVo.getOrderPayment());
+                orderPaymentService.createOrderPayment(order, orderPayDto, identityType,shop);
             }catch (PlatformServiceException pe){
                 LOGGER.info("微信支付异常，支付订单号：{}，异常信息{}",orderWeChatPayBatch.getCodes(),pe.getMessage());
                 wxChatPayCloseOnly(weChatPayTradeBackDto.getPaymentId(),orderWeChatPayBatch.getMarketId(),null);
@@ -826,9 +825,8 @@ public class OrderServiceImpl implements OrderService {
         }
         //扣减库存T
         orderGoodsService.deductBatch(orderList,orderWeChatPayBatch.getPayerCustomerId(),orderWeChatPayBatch.getPayerCustomerName());
-
-        //保存待支付单
-        //orderPaymentService.saveBatch(orderPaymentList);
+        //更新扣减库存状态
+        orderMapper.updateDeductState(orderList.stream().map(Order::getId).collect(Collectors.toList()));
         //返回数据，由小程序发起微信支付。
         return Message.success(weChatPayTradeBackDto);
     }
+package com.diligrp.etrade.order.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+/**
+ * 操作类型
+ */
+public enum OrderDeductionState implements IEnumType {
+    UN_DEDUCT("未扣减", 1),
+    DEDUCT_FINISH("已扣减", 2)
+    ;
+
+    private String name;
+    private Integer code;
+
+    private OrderDeductionState(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static OrderDeductionState getByCode(Integer code) {
+        for (OrderDeductionState temp : OrderDeductionState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp;
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByCode(Integer code) {
+        for (OrderDeductionState temp : OrderDeductionState.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp.getName();
+            }
+        }
+        return null;
+    }
+
+    public Integer getCodeInteger() {
+        return this.code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
@@ -9,7 +9,10 @@ public enum OrderState implements IEnumType {
     FINISH("已完成", 3),
     CANCEL("已取消", 4),
     INVALID("已作废", 5),
-    PAY_FINISH("已支付", 6);
+    PAY_FINISH("已支付", 6),
+    WAIT_MAPPING("待核销", 601),
+    WAIT_SEND("待配送", 611),
+    WAIT_GET("待收货", 612);
  
     private String name;
     private Integer code;
@@ -22,7 +22,7 @@ public class ParameterDetection {
     }
  
     public static String sqlLikeParam(String param){
-        if(StrUtil.isEmpty(param)){
+        if(StrUtil.isBlank(param)){
             return null;
         }else{
             return "%"+param+"%";
@@ -30,7 +30,7 @@ public class ParameterDetection {
     }
  
     public static String sqlEnterParam(String param){
-        if(StrUtil.isEmpty(param)){
+        if(StrUtil.isBlank(param)){
             return null;
         }else{
             return param;
@@ -210,9 +210,11 @@
         opa.pay_channel as pay_channel,
         ord.achieve_type as achieve_type,
         ord.achieve_state as achieve_state,
+        ody.way_type as wayType,
         (CASE WHEN opa.payee_seller_name IS NULL OR opa.payee_seller_name = '' THEN ord.shop_customer_name ELSE opa.payee_seller_name END) AS payee_seller_name
         from `order` ord
         left join order_payment opa on opa.order_id = ord.id and opa.`state` = 2
+        left join order_delivery ody on ord.id = ody.order_id
         <where>
             (ord.`state` != 0 or ord.`state` is null) and ord.market_id = #{marketId}
             <if test="orderState != null">