Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java

@@ -10,6 +10,11 @@ public class HardOrderSumAndCountDto {
 
     private List<Long> userDeptIds;
 
+    /**
+     * 是否包含deptIds
+     */
+    private Boolean isInclude = false;
+
     private List<String> orderStatusCodes;
 
     private LocalDateTime[] createTimeList;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/WechatPay.java

@@ -40,4 +40,8 @@ public class WechatPay {
      */
     private String refundCallbackUrl;
 
+    /**
+     * 调用ip
+     */
+    private String spbillCreateIp;
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java

@@ -294,10 +294,6 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
                 log.error("微信退款回调通知,售后单不存在refunId:{}", refunId);
                 return false;
             }
-            if (ObjectUtil.equals(afterSale.getStatus(), HardSaleStatusEnum.COMPLETE.getStatus())) {
-                log.error("微信退款回调通知,售后单已处理完成refunId:{}", refunId);
-                return false;
-            }
             HardOrderEntity updateObj = HardOrderEntity.builder()
                     .id(order.getId())
                     .orderStatus(HardOrderStatusEnum.REFUND.getType())

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/wechat/WechatPayServiceImpl.java

@@ -160,7 +160,7 @@ public class WechatPayServiceImpl implements WechatPayService {
             // 订单金额(分)
             params.put("total_fee", dto.getPrice());
             // 终端IP
-            params.put("spbill_create_ip", "220.191.229.131");
+            params.put("spbill_create_ip", wechatPay.getSpbillCreateIp());
             // 付款码
             params.put("auth_code", dto.getWechatQrCode());
             // 生成签名

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml

@@ -25,10 +25,11 @@ spring:
 # pay-callback:
 #   lb-mch-id: 1919673632357584898
 
-wechat-pay:
-  merchant-id: 1718803142
-  api-v2-key: EDn3OfIZZFwyS9Obx73XgQ8NHt01piUa
-  app-id: wx4ec0210f4bf42f9f
-  base-url: https://api.mch.weixin.qq.com
-  refund-callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-wechant-pay/callback/refund
-  merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/cert/apiclient_cert.p12
+#wechat-pay:
+#  merchant-id: 1718803142
+#  api-v2-key: EDn3OfIZZFwyS9Obx73XgQ8NHt01piUa
+#  app-id: wx4ec0210f4bf42f9f
+#  base-url: https://api.mch.weixin.qq.com
+#  refund-callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-wechant-pay/callback/refund
+#  merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/cert/apiclient_cert.p12
+#  spbill-create-ip: 59.202.170.152