huanglizhi 11 hónapja
szülő
commit
4dd7c17185

+ 5 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/PayTypeUrl.java

@@ -28,5 +28,10 @@ public class PayTypeUrl {
     @NotNull(message = "用户不能为空")
     private String userId;
 
+
+    @ApiModelProperty(name = "order_id", value = "订单ID")
+    @NotNull(message = "用户不能为空")
+    private String ip;
+
 }
 

+ 2 - 0
module-erp/src/main/java/com/hys/app/pay/ali/PayOrder.java

@@ -23,4 +23,6 @@ public class PayOrder {
 
     private String orderPayType;//订单类型
 
+    private String ip;//订单类型
+
 }

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

@@ -111,16 +111,26 @@ public class WxPayServiceMy {
         orderRequest.setSubMchId(wxConfig.getSubMchId());
         try {
             WxPayUnifiedOrderResult result = wxPayService.unifiedOrder(orderRequest);
-            Map<String, String> payData = new HashMap<>();
-            payData.put("appId", wxConfig.getAppId());
-            payData.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
-            payData.put("nonceStr", result.getNonceStr());
-            payData.put("package", "prepay_id=" + result.getPrepayId());
-            payData.put("signType", "MD5");
-            String sign = SignUtils.createSign(payData, wxConfig.getMchKey(), null, null);
-            payData.put("paySign", sign);
-            System.out.println(payData);
-            return payData;
+            Map<String, String> params = new HashMap<>();
+            params.put("appId", wxConfig.getAppId());
+            params.put("mch_id", wxConfig.getMchId());
+            params.put("nonceStr", result.getNonceStr());
+            params.put("body", "商品描述");
+            params.put("out_trade_no", payOrder.getTraceNo());
+            params.put("total_fee", String.valueOf(payOrder.getTotalAmount()));
+            params.put("spbill_create_ip", payOrder.getIp());
+            params.put("notify_url", wxConfig.getNotifyUrl());
+            params.put("trade_type", "JSAPI"); // 或 "NATIVE", "APP" 等
+//            Map<String, String> payData = new HashMap<>();
+//            payData.put("appId", wxConfig.getAppId());
+//            payData.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
+//            payData.put("nonceStr", result.getNonceStr());
+//            payData.put("package", "prepay_id=" + result.getPrepayId());
+//            payData.put("signType", "MD5");
+            String sign = SignUtils.createSign(params, wxConfig.getMchKey(), null, null);
+            params.put("paySign", sign);
+            System.out.println(params);
+            return params;
         } catch (WxPayException e) {
             e.printStackTrace();
             return null;

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/CompanyErpManagerImpl.java

@@ -66,7 +66,7 @@ public class CompanyErpManagerImpl extends ServiceImpl<CompanyErpMapper, Company
     @Transactional(rollbackFor = Exception.class)
     public String createCompany(CompanyDO companyDO) {
         String code = (String)redisTemplate.opsForValue().get(companyDO.getCheckCodeKey());
-        if (!code.equals(companyDO.getCheckCode())){
+        if (StrUtil.isNotBlank(companyDO.getCheckCode()) && !code.equals(companyDO.getCheckCode())){
             throw new ServiceException("验证码错误");
         }
         CompanyPackage byId = companyPackageManager.getById(companyDO.getCompanyPackageId());