微信支付

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -676,6 +676,19 @@ public class CommConstant {
      */
     public static final String PAY_STATUS_REFUNDED = "refunded";
 
+
+    /**
+     * 已经取消支付
+     *
+     */
+    public static final String PAY_STATUS_CANCEL = "cancel";
+
+    /**
+     * 支付超时
+     *
+     */
+    public static final String PAY_STATUS_TIMEOUT = "timeout";
+
     /**
      * 最大认筹金额
      */

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -112,14 +112,15 @@ public class WxPayServiceImpl implements IWxPayService {
         //第二次重新生成签名
         Map<String, String> secondSignData = new HashMap<String, String>();
         long timestamp = Instant.now().getEpochSecond();
-        secondSignData.put("appid", config.getAppID());
-        secondSignData.put("partnerid", config.getMchID());
-        secondSignData.put("prepayid", resp.get("prepay_id"));
-        secondSignData.put("noncestr", resp.get("nonce_str"));
-        secondSignData.put("timestamp", String.valueOf(timestamp));
-        secondSignData.put("package", "Sign=WXPay");
+        secondSignData.put("appId", config.getAppID());
+        secondSignData.put("nonceStr", resp.get("nonce_str"));
+        secondSignData.put("timeStamp", String.valueOf(timestamp));
+        secondSignData.put("package", "prepay_id="+resp.get("prepay_id"));
+        secondSignData.put("signType", WXPayConstants.SignType.MD5.toString());
         secondSignData.put("sign", WXPayUtil.generateSignature(secondSignData, config.getKey(), WXPayConstants.SignType.MD5));
 
+        //        secondSignData.put("partnerid", config.getMchID());
+//        secondSignData.put("prepayid", resp.get("prepay_id"));
         log.info("订单: {}，订单类型: {}, 状态变更为正在支付", taOrder.getTradeNo(), taOrder.getTargetType());
 
         // 更改认筹单单状态 为正在支付，并插入订单表
@@ -229,6 +230,10 @@ public class WxPayServiceImpl implements IWxPayService {
 
             //校验并自动解锁
             autoUnLockingHouse(taRaiseRecord,taRaiseHouse,taHousingResources);
+
+            //取消订单
+            taOrder.setPayStatus(CommConstant.PAY_STATUS_CANCEL);
+            taOrderMapper.updateById(taOrder);
         }
     }
 
@@ -441,7 +446,6 @@ public class WxPayServiceImpl implements IWxPayService {
 
         //更改支付状态并插入订单id
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
-        taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_PAYING);
         taRaiseRecord.setOrderId(taOrder.getOrderId());
         taRaiseRecordMapper.updateById(taRaiseRecord);
     }