新需求

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

@@ -641,4 +641,34 @@ public class CommConstant {
      * 未锁定
      */
     public static final String HOUSE_LOCKING_STATUS_UNLOCKED = "unlocked";
+
+    /**
+     * 房源订单
+     */
+    public static final String ORDER_TARGET_TYPE_HOUSE = "house";
+
+    /**
+     * 自动锁房
+     */
+    public static final String HOUSE_LOCKING_TYPE_AUTO = "auto";
+
+    /**
+     * 正在缴费
+     */
+    public static final String PAY_STATUS_PAYING = "paying";
+
+    /**
+     * 未缴费
+     */
+    public static final String PAY_STATUS_UNPAID = "unpaid";
+
+    /**
+     * 已缴费
+     */
+    public static final String PAY_STATUS_PAID = "paid";
+
+    /**
+     * 已退费
+     */
+    public static final String PAY_STATUS_REFUNDED = "refunded";
 }

src/main/java/com/huiju/estateagents/controller/WxPayController.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.controller;
 
-import com.google.common.collect.Maps;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.wxpay.WXPayUtil;
@@ -11,10 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,6 +23,12 @@ public class WxPayController extends BaseController {
     @Autowired
     private IWxPayService wxPayService;
 
+    /**
+     * 微信统一下单接口
+     * @param taOrder
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "/pay/unifiedOrder",method = RequestMethod.POST)
     public ResponseBean wxUnifiedOrder(@RequestBody TaOrder taOrder,
                                        HttpServletRequest request){
@@ -36,7 +38,7 @@ public class WxPayController extends BaseController {
             taOrder.setPersonId(getPersonId(request));
             responseBean = wxPayService.payUnifiedOrder(taOrder,request.getRemoteAddr());
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("微信统一下单失败： {}" , e.getMessage());
             responseBean.addError(e.getMessage());
             return responseBean;
         }

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

@@ -8,21 +8,24 @@ import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WXPayUtil;
 import com.huiju.estateagents.common.wxpay.WxConfig;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaRaiseMapper;
-import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
-import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IWxPayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.ws.soap.Addressing;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class WxPayServiceImpl implements IWxPayService {
 
     @Value("${pay-notify}")
@@ -37,6 +40,15 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private TaRaiseMapper taRaiseMapper;
 
+    @Autowired
+    private TaRaiseHouseMapper taRaiseHouseMapper;
+    
+    @Autowired
+    private TaHousingResourcesMapper taHousingResourcesMapper;
+
+    @Autowired
+    private TaOrderMapper taOrderMapper;
+
     /**
      * 微信支付-统一下单
      *
@@ -50,18 +62,20 @@ public class WxPayServiceImpl implements IWxPayService {
         WxConfig config = getWxConfig(taOrder.getOrgId());
         WXPay wxpay = new WXPay(config);
 
+        //获取支付的钱数并且判断是自动锁房还是手动锁房,自动锁房需要锁定房源，手动锁房跳过
         String payPrice = getPayPrice(taOrder);
         if (null == payPrice){
-            throw new Exception("此认筹单异常，请联系置业顾问！");
+            throw new Exception("此认筹单异常请联系置业顾问！");
         }
 
         //生成商户订单
-        String tradeNo = "这边的规则要重新定义";
+        String prefix = taOrder.getTargetType().equals(CommConstant.ORDER_TARGET_TYPE_HOUSE) ? "H" : "D";
+        String tradeNo = prefix + System.currentTimeMillis() + taOrder.getTargetId();
         taOrder.setTradeNo(tradeNo);
 
         //下单
         Map<String, String> data = new HashMap<String, String>();
-        data.put("body", taOrder.getTargetType().equals("house") ? "房源认筹" : "微信支付");
+        data.put("body", taOrder.getTargetType().equals(CommConstant.ORDER_TARGET_TYPE_HOUSE) ? "房源认筹" : "微信支付");
         //商品号唯一
         data.put("out_trade_no", tradeNo);
         data.put("device_info", "");
@@ -106,7 +120,7 @@ public class WxPayServiceImpl implements IWxPayService {
             //处理业务逻辑 修改订单状态等
             resultMap.put("pay_type","0");
             String state = "";
-            if (type.equals("house")) {
+            if (type.equals(CommConstant.ORDER_TARGET_TYPE_HOUSE)) {
                 //state = wxPayService.wxCarNotify(resultMap);
             }
 
@@ -121,29 +135,88 @@ public class WxPayServiceImpl implements IWxPayService {
     }
 
     /**
-     * 获取支付的钱数
+     * 获取支付的钱数并且判断是自动锁房还是手动锁房,自动锁房需要锁定房源，手动锁房跳过
      * @param taOrder
      * @return
      */
-    private String getPayPrice(TaOrder taOrder) {
+    private String getPayPrice(TaOrder taOrder) throws Exception {
+        log.info("正在获取认类型为{}认筹筹单为{}，的认筹金额",taOrder.getTargetType(),taOrder.getTargetId());
         //根据targetType取不同的表的数据
-        if (taOrder.getTargetType().equals("house")){
+        if (taOrder.getTargetType().equals(CommConstant.ORDER_TARGET_TYPE_HOUSE)){
             TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
             if (null == taRaiseRecord){
-                return null;
-            }
-            if (taRaiseRecord.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED)){
-                return null;
+                throw new Exception("此认筹单不存在！请联系置业顾问！");
             }
+
+            //获取认筹信息
             TaRaise taRaise = taRaiseMapper.selectById(taRaiseRecord.getRaiseId());
             if (null == taRaise){
-                return null;
+                throw new Exception("此认筹不存在！请联系置业顾问！");
+            }
+            if (null == taRaise.getRaisePrice()){
+                throw new Exception("此认筹金额存在异常！请联系置业顾问！");
+            }
+            //判断是自动锁房状态还是手动锁房状态，手动锁房跳过，自动锁房需要锁房
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO)){
+                //校验并自动锁房
+                autoLockingHouse(taOrder,taRaiseRecord,taRaise);
             }
+
+            //插入实付金额
+            taOrder.setTotalFee(taRaise.getRaisePrice());
             return String.valueOf(taRaise.getRaisePrice());
         }
         return null;
     }
 
+    /**
+     * 校验这个人的合法性，并自动锁房
+     * @param taOrder
+     * @param taRaiseRecord
+     * @param taRaise
+     */
+    private void autoLockingHouse(TaOrder taOrder, TaRaiseRecord taRaiseRecord, TaRaise taRaise) throws Exception {
+        //如果是自动锁房，客户只能锁定一个房源
+        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+        taRaiseHouseQueryWrapper.eq("org_id",taOrder.getOrgId());
+        taRaiseHouseQueryWrapper.eq("raise_record_id",taRaiseRecord.getRaiseRecordId());
+        taRaiseHouseQueryWrapper.eq("person_id",taOrder.getPersonId());
+        List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseMapper.selectList(taRaiseHouseQueryWrapper);
+        if (taRaiseHouseList.size() != 1){
+            throw new Exception("自动锁房只能认筹一个房源。");
+        }
+        //判断此房源有没有被锁定
+        TaHousingResources taHousingResources = getHousingResourcesById(taRaiseHouseList.get(0).getHouseId());
+        if (taHousingResources.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+            throw new Exception("改房源已被锁定暂时无法认筹。");
+        }
+        //锁定此房源并且更改认筹单的锁定状态
+        changeLockingStatus(taRaiseRecord,taRaiseHouseList.get(0),taHousingResources);
+    }
+
+    /**
+     * 锁定此房源并且更改认筹单的锁定状态
+     * @param taRaiseRecord
+     * @param taRaiseHouse
+     * @param taHousingResources
+     */
+    private synchronized void changeLockingStatus(TaRaiseRecord taRaiseRecord, TaRaiseHouse taRaiseHouse, TaHousingResources taHousingResources) {
+        log.info("正在为客户personId为{}选中的房源id为{}自动锁房",taRaiseHouse.getPersonId(),taRaiseHouse.getHouseId());
+        //更改此房源为锁定状态
+        taHousingResources.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+        taHousingResourcesMapper.updateById(taHousingResources);
+        //更改此认筹旦和房源关系为锁定状态
+        taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+        taRaiseHouseMapper.updateById(taRaiseHouse);
+        //更改认筹单为锁定状态
+        taRaiseRecord.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
+        taRaiseRecordMapper.updateById(taRaiseRecord);
+    }
+
+    private synchronized TaHousingResources getHousingResourcesById(Integer houseId) {
+        return taHousingResourcesMapper.selectById(houseId);
+    }
+
     /**
      * 获取每个小程序独立的微信账户
      * @param orgId
@@ -157,6 +230,7 @@ public class WxPayServiceImpl implements IWxPayService {
         if (null == taWxPayConfig){
             throw new Exception("请先完善支付信息");
         }
+        log.info("正在配置orgId为{}的微信支付参数，商户号为{}",orgId,taWxPayConfig.getMchId());
         //把库里的值赋值给微信
         WxConfig config = new WxConfig();
         config.setAppid(taWxPayConfig.getAppid());
@@ -167,10 +241,21 @@ public class WxPayServiceImpl implements IWxPayService {
     }
 
     /**
-     * 更改订单状态为正在支付
+     * 更改认筹单状态 为正在支付，并插入订单表
      * @param taOrder
      */
-    private void updateOrderStatus(TaOrder taOrder) {
+    private synchronized void updateOrderStatus(TaOrder taOrder) {
+        //生成订单表
+        taOrder.setCreateDate(LocalDateTime.now());
+        taOrder.setPayStatus(CommConstant.PAY_STATUS_PAYING);
+        taOrderMapper.insert(taOrder);
+
+        log.info("正在生成订单，订单id为{}",taOrder.getOrgId());
 
+        //更改支付状态并插入订单id
+        TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
+        taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_PAYING);
+        taRaiseRecord.setOrderId(taOrder.getOrderId());
+        taRaiseRecordMapper.updateById(taRaiseRecord);
     }
 }

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -11,8 +11,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class WxPayTest {
 
-    @Test
+//    @Test
     public void getLocationCity() {
-
+        System.out.println(System.currentTimeMillis());
     }
 }