退款

yiqi-common/src/main/java/com/yiqi/order/domain/dto/PayOrderAppDTO.java

@@ -24,6 +24,7 @@ public class PayOrderAppDTO extends PayOrderDTO{
     public static PayOrderAppDTO buildRechargeOrderPayData(OrderRecharge orderRecharge, String platform){
         PayOrderAppDTO payOrderAppDTO = new PayOrderAppDTO();
         payOrderAppDTO.setPlatform(platform);
+        payOrderAppDTO.setStoreId(orderRecharge.getStoreId());
         payOrderAppDTO.setOrderNo(orderRecharge.getOrderNo());
         payOrderAppDTO.setPayAmount(orderRecharge.getPayAmount());
         payOrderAppDTO.setSubjectTitle(OrderType.recharge.getInfo());

yiqi-common/src/main/java/com/yiqi/order/domain/dto/PayOrderDTO.java

@@ -13,6 +13,9 @@ import java.util.Date;
  */
 @Data
 public class PayOrderDTO {
+
+    private Long storeId;
+    
     @ApiModelProperty("支付方式（0=微信，1=支付宝）")
     private String payType;
 

yiqi-common/src/main/java/com/yiqi/order/service/IOrderPayInfoService.java

@@ -71,7 +71,7 @@ public interface IOrderPayInfoService extends IService<OrderPayInfo> {
      * @param payType
      * @return
      */
-    OrderPayInfo createOrderPayInfo(String orderNo, BigDecimal payAmount, String payType);
+    OrderPayInfo createOrderPayInfo(Long storeId, String orderNo, BigDecimal payAmount, String payType);
 
     /**
      * 根据支付订单号查询第三方支付记录

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -413,10 +413,10 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
     public void refundOrderApply(Long orderId, String remark) {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getId, orderId);
-        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+        if (SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
             queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
         }
-        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+        if (SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
             queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
         OrderCloth orderCloth = getOne(queryWrapper);
@@ -507,7 +507,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
             this.updateById(orderCloth);
             try {
                 //创建支付订单，防止出现错误
-                OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(orderCloth.getOrderNo(), orderCloth.getPayAmount(), orderCloth.getPayType());
+                OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(orderCloth.getOrgId(), orderCloth.getOrderNo(), orderCloth.getPayAmount(), orderCloth.getPayType());
                 //优先增加到延迟队列
                 DelayMessage delayMessage = new DelayMessage(orderPayInfo.getRequestNo(), DelayTagsEnum.ORDER_PAY_DELAY_QUEUE.getCode(), JSONUtil.toJsonStr(orderPayInfo));
                 //暂不执行
@@ -1074,7 +1074,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                 break;
             case 2:
                 // 取衣中
-                orderStatus = new Integer[]{1,2,3};
+                orderStatus = new Integer[]{1, 2, 3};
                 break;
             case 3:
                 // 待支付
@@ -1086,7 +1086,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                 break;
             case 5:
                 // 清洗中
-                orderStatus = new Integer[]{6,7};
+                orderStatus = new Integer[]{6, 7};
                 break;
             case 6:
                 // 待上挂
@@ -1102,7 +1102,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                 break;
             case 99:
                 // 已完成
-                orderStatus = new Integer[]{11,12};
+                orderStatus = new Integer[]{11, 12};
                 break;
             case 100:
                 orderStatus = new Integer[]{100};

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderGoodsServiceImpl.java

@@ -297,7 +297,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             this.updateById(orderGoods);
             try {
                 //创建支付订单，防止出现错误
-                OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(orderGoods.getOrderNo(), orderGoods.getPayAmount(), orderGoods.getPayType());
+                OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(orderGoods.getOrgId(), orderGoods.getOrderNo(), orderGoods.getPayAmount(), orderGoods.getPayType());
                 //优先增加到延迟队列
                 DelayMessage delayMessage = new DelayMessage(orderPayInfo.getRequestNo(), DelayTagsEnum.ORDER_PAY_DELAY_QUEUE.getCode(), JSONUtil.toJsonStr(orderPayInfo));
                 //暂不执行

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderPayInfoServiceImpl.java

@@ -92,8 +92,9 @@ public class OrderPayInfoServiceImpl extends ServiceImpl<OrderPayInfoMapper, Ord
     }
 
     @Override
-    public OrderPayInfo createOrderPayInfo(String orderNo, BigDecimal payAmount, String payType) {
+    public OrderPayInfo createOrderPayInfo(Long storeId, String orderNo, BigDecimal payAmount, String payType) {
         OrderPayInfo orderPayInfo = new OrderPayInfo();
+        orderPayInfo.setStoreId(storeId);
         orderPayInfo.setPayType(payType);
         orderPayInfo.setOrderNo(orderNo);
         orderPayInfo.setPayAmount(payAmount);

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderRechargeServiceImpl.java

@@ -446,7 +446,7 @@ public class OrderRechargeServiceImpl extends ServiceImpl<OrderRechargeMapper, O
                 try {
                     //创建支付订单，防止出现错误
                     BigDecimal payAmount = CurrencyUtil.add(orderRecharge.getWxPayAmount(), orderRecharge.getAliPayAmount());
-                    OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(orderRecharge.getOrderNo(), payAmount, orderRecharge.getWxPayAmount().compareTo(BigDecimal.ZERO) > 0 ? PayType.WECHAT.getCode() : PayType.ALIPAY.getCode());
+                    OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(orderRecharge.getStoreId(), orderRecharge.getOrderNo(), payAmount, orderRecharge.getWxPayAmount().compareTo(BigDecimal.ZERO) > 0 ? PayType.WECHAT.getCode() : PayType.ALIPAY.getCode());
                     //优先增加到延迟队列
                     DelayMessage delayMessage = new DelayMessage(orderPayInfo.getRequestNo(), DelayTagsEnum.ORDER_PAY_DELAY_QUEUE.getCode(), JSONUtil.toJsonStr(orderPayInfo));
                     //暂不执行

yiqi-core/src/main/java/com/yiqi/order/service/impl/PayServiceImpl.java

@@ -136,7 +136,7 @@ public class PayServiceImpl implements IPayService {
 
     @Override
     public AppPayRespVO appPay(PayOrderAppDTO payOrderAppDTO) {
-        OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payOrderAppDTO.getOrderNo(), payOrderAppDTO.getPayAmount(), payOrderAppDTO.getPayType());
+        OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payOrderAppDTO.getStoreId(), payOrderAppDTO.getOrderNo(), payOrderAppDTO.getPayAmount(), payOrderAppDTO.getPayType());
         payOrderAppDTO.setOrderNo(orderPayInfo.getRequestNo());
         switch (EnumUtils.getEnumByType(payOrderAppDTO.getPayType(), PayType.class)) {
             case WECHAT: {