Merge remote-tracking branch 'origin/dev' into dev

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/controller/TaRaiseRecordController.java

@@ -482,13 +482,26 @@ public class TaRaiseRecordController extends BaseController {
         try {
             //获取认筹单信息
             TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
+
             //认筹表数据
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
             taRaise.setRaisePrice(taRaise.getRaisePrice()/100);
             //房源与认筹单关系图
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
+
             //房源信息
             List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+
+            //我的认筹和锁定
+            houseList.forEach(e -> {
+                taRaiseHouseList.forEach(r -> {
+                    //我的认筹
+                    if (e.getHouseId().equals(r.getHouseId()) && r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
+                        e.setMineLocked("mine");
+                    }
+                });
+            });
+
             //订单信息
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
 

src/main/java/com/huiju/estateagents/entity/TaHousingResources.java

@@ -167,4 +167,10 @@ public class TaHousingResources implements Serializable {
 
     @TableField(exist = false)
     private List<TaHousingResources> houseIdList;
+
+    /**
+     * 我的锁定
+     */
+    @TableField(exist = false)
+    private String mineLocked;
 }

src/main/java/com/huiju/estateagents/entity/TaRaiseRecord.java

@@ -58,6 +58,11 @@ public class TaRaiseRecord implements Serializable {
      */
     private String personId;
 
+    /**
+     * 认筹人姓名
+     */
+    private String personName;
+
     /**
      * 房源数
      */

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -69,12 +69,6 @@ public class TaHousingResourcesPO extends TaHousingResources {
     @TableField(exist = false)
     private String mineRaise;
 
-    /**
-     * 我的锁定
-     */
-    @TableField(exist = false)
-    private String mineLocked;
-
     /**
      * 锁定人ID
      */

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

@@ -86,7 +86,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         });
 
         if (updateBatchById(taRaiseList)) {
-            responseBean.addError("success");
+            responseBean.addSuccess("操作成功");
         } else {
             responseBean.addError("fail");
         }

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);
     }