huanglizhi před 1 rokem
rodič
revize
db9f5c12c4

+ 5 - 4
module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java

@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -46,7 +47,7 @@ import java.util.Map;
 @Api(tags = "订单支付")
 @Validated
 @AllArgsConstructor
-public class PayController {
+public class PayController extends HttpServlet {
     private OrderManager orderManager;
     private AliPayService aliPayService;
     private WxPayServiceMy wxPayServiceMy;
@@ -139,9 +140,9 @@ public class PayController {
         String[] split = state.split("--");
         String orderId = split[0];
         String ip = split[1];
-//        if (!state.equals((String) session.getAttribute("WEIXIN_OAUTH_STATE"))) {
-//            log.error("用户授权,state错误");
-//        }
+        if (!state.equals((String) session.getAttribute("WEIXIN_OAUTH_STATE"))) {
+            log.error("用户授权,state错误");
+        }
         OrderDO aDo = orderManager.getById(Long.valueOf(orderId));
         if (ObjectUtil.isNull(aDo)) {
             log.error("用户授权完成后未找到订单信息:" + state);

+ 3 - 3
module-erp/src/main/java/com/hys/app/pay/wx/WxPayServiceMy.java

@@ -115,9 +115,9 @@ public class WxPayServiceMy {
             payData.put("nonceStr", result.getNonceStr());
             payData.put("package", "prepay_id=" + result.getPrepayId());
             payData.put("signType", "MD5");
-            payData.put("openid", payOrder.getOpenId());
-            payData.put("paySign", SignUtils.createSign(payData, wxPayService.getConfig().getMchKey(), null, null));
-            System.out.println(payData.toString());
+            String sign = SignUtils.createSign(payData, wxPayService.getConfig().getMchKey(), null, null);
+            payData.put("paySign", sign);
+            System.out.println(payData);
             return payData;
         } catch (WxPayException e) {
             e.printStackTrace();