shiyunlong 1 год назад
Родитель
Сommit
34694076b8

+ 33 - 0
admin/src/main/java/com/mofangchuxing/aska/admin/controller/SysUserController.java

@@ -14,6 +14,7 @@ import com.mofangchuxing.aska.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
@@ -45,6 +46,21 @@ public class SysUserController extends AdminBaseController{
     @Resource
     private AskaChannelsMapper askaChannelsMapper;
 
+    @Value("${wx.app-id}")
+    private String appId;
+    @Value("${wx.app-appid}")
+    private String appAppId;
+    @Value("${wx.mch-id}")
+    private String mchId;
+    @Value("${wx.api-key}")
+    private String apiKey;
+    @Value("${wx.apiv3-key}")
+    private String apiv3Key;
+    @Value("${wx.api-serial-no}")
+    private String apiSerialNo;
+    @Value("${wx.public-serial-no}")
+    private String publicSerialNo;
+
     @RequestMapping(value = "/Login", method = {RequestMethod.POST, RequestMethod.GET})
     public R login(@RequestBody LoginDto loginDto) {
         log.info("登录用户信息=={}", JSON.toJSONString(loginDto));
@@ -96,6 +112,23 @@ public class SysUserController extends AdminBaseController{
         return R.ok(result);
     }
 
+    @PostMapping("/getPayAccount")
+    public R getPayAccount(@RequestBody LoginDto loginDto) {
+        AskaAccounts askaAccounts = getSysUser(loginDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("appId", appId);
+        result.put("appAppid", appAppId);
+        result.put("mchId", mchId);
+        result.put("apiKey", apiKey);
+        result.put("apiv3Key", apiv3Key);
+        result.put("apiSerialNo", apiSerialNo);
+        result.put("publicSerialNo", publicSerialNo);
+        return R.ok(result);
+    }
+
     @RequestMapping("/Logout")
     public R logout(String t) {
         redisTemplate.delete(SYS_USER + t);

BIN
admin/target/aska-admin.jar


BIN
admin/target/aska-admin.jar.original


BIN
admin/target/classes/com/mofangchuxing/aska/admin/controller/SysUserController.class


BIN
dao/target/aska-dao-1.0.jar


BIN
domain/target/aska-domain-1.0.jar


+ 2 - 1
main/src/main/resources/application.yml

@@ -49,4 +49,5 @@ wx:
   api-serial-no: 22098B381BAE268F47FE823C70C3AA7702EE54C4
   public-serial-no: 5BB0B8268EB289373EDFA3B1572FE3F2F8FD3B80
   unified-order-url: https://api.mch.weixin.qq.com/pay/unifiedorder
-  notify-url: https://biketest.mofangchuxing.com/askay/notify
+  notify-url: https://biketest.mofangchuxing.com/askay/notify
+  refund-notify-url: https://test-crm2gw.adb-tech.com/market/client/refundNotify

BIN
main/target/aska.jar


BIN
main/target/aska.jar.original


+ 2 - 1
main/target/classes/application.yml

@@ -49,4 +49,5 @@ wx:
   api-serial-no: 22098B381BAE268F47FE823C70C3AA7702EE54C4
   public-serial-no: 5BB0B8268EB289373EDFA3B1572FE3F2F8FD3B80
   unified-order-url: https://api.mch.weixin.qq.com/pay/unifiedorder
-  notify-url: https://biketest.mofangchuxing.com/askay/notify
+  notify-url: https://biketest.mofangchuxing.com/askay/notify
+  refund-notify-url: https://test-crm2gw.adb-tech.com/market/client/refundNotify

+ 3 - 0
service/src/main/java/com/mofangchuxing/aska/service/impl/PayServiceImpl.java

@@ -52,6 +52,8 @@ public class PayServiceImpl implements PayService {
     private String UNIFIED_ORDER_URL;
     @Value("${wx.notify-url}")
     private String notifyUrl;
+    @Value("${wx.refund-notify-url}")
+    private String refundNotifyUrl;
 
     @Resource
     private PayRequestMapper payRequestMapper;
@@ -140,6 +142,7 @@ public class PayServiceImpl implements PayService {
         if (!result) {
             return new ResponseResult(ResultEnum.UNKNOWN_ERROR);
         }
+        delayNotifyComponent.notifyDown(payRequest.getOrderId(), refundNotifyUrl);
         RefundOrder refundOrder = new RefundOrder();
         refundOrder.setOrderSn(payRequestDto.getPaymentId());
         refundOrder.setRefundOrderSn(refundOrderNo);

BIN
service/target/aska-service-1.0.jar


BIN
service/target/classes/com/mofangchuxing/aska/service/impl/PayServiceImpl.class