zyp 2 日 前
コミット
21587c8db7

+ 2 - 0
fs-service/src/main/java/com/fs/common/param/LoginMaWxParam.java

@@ -53,4 +53,6 @@ public class LoginMaWxParam implements Serializable {
     @ApiModelProperty(value = "小程序授权类型")
     private Integer authType;
 
+    private String appId;
+
 }

+ 3 - 0
fs-user-course/src/main/java/com/fs/course/controller/WxCompanyUserController.java

@@ -96,6 +96,9 @@ public class WxCompanyUserController extends AppBaseController {
         if (company.getCourseMiniAppId() == null) {
             return R.error("小程序参数错误!");
         }
+//        if (!param.getAppId().equals(company.getCourseMiniAppId())){
+//            return R.error("无权限,");
+//        }
 
         final WxMaService wxService = WxMaConfiguration.getMaService(company.getCourseMiniAppId());
         try {

+ 82 - 0
fs-user-course/src/main/java/com/fs/course/controller/WxPayController.java

@@ -0,0 +1,82 @@
+package com.fs.course.controller;
+
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
+import com.fs.course.service.IFsCourseRedPacketLogService;
+import com.fs.course.service.IFsUserCourseOrderService;
+import com.fs.course.service.IFsUserVipOrderService;
+import com.fs.his.param.WxSendRedPacketParam;
+import com.fs.his.service.IFsInquiryOrderService;
+import com.fs.his.service.IFsPackageOrderService;
+import com.fs.his.service.IFsStoreOrderService;
+import com.fs.his.service.IFsStorePaymentService;
+import com.fs.sop.service.ISopUserLogsInfoService;
+import com.fs.system.service.ISysConfigService;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.service.WxPayService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Api("微信支付接口")
+@RestController
+@RequestMapping("/app/wxpay")
+public class WxPayController {
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    @Autowired
+    private WxPayService wxPayService;
+    @Autowired
+    private IFsInquiryOrderService inquiryOrderService;
+    @Autowired
+    private IFsStoreOrderService storeOrderService;
+    @Autowired
+    private IFsPackageOrderService packageOrderService;
+
+    @Autowired
+    private IFsUserCourseOrderService courseOrderService;
+
+    @Autowired
+    private IFsUserVipOrderService userVipOrderService;
+    @Autowired
+    private IFsStorePaymentService  paymentService;
+    @Autowired
+    private IFsCourseRedPacketLogService redPacketLogService;
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private ISopUserLogsInfoService iSopUserLogsInfoService;
+
+    @PostMapping("/sendRedPacket")
+    public R sendRedPacket(@RequestBody WxSendRedPacketParam param){
+       return paymentService.sendRedPacketTest(param);
+    }
+
+    @PostMapping( "/TransferNotify")
+    public String TransferNotify(@RequestBody String notifyData,HttpServletRequest request, HttpServletResponse response) throws Exception {
+        return paymentService.transferNotify(notifyData,request);
+    }
+
+
+    @PostMapping( "/v3TransferNotify")
+    public String v3TransferNotify(@RequestBody String notifyData,HttpServletRequest request, HttpServletResponse response) throws Exception {
+        return paymentService.v3TransferNotify(notifyData,request);
+    }
+
+    @GetMapping("/test")
+    public void test(){
+        iSopUserLogsInfoService.updateSopUserInfoByExternalId(1L,123456L);
+    }
+
+
+
+}