联调

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

@@ -8,9 +8,11 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.SysAdvancedConfig;
 import com.huiju.estateagents.entity.TaAdvancedController;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaWxPayConfig;
 import com.huiju.estateagents.service.ISysAdvancedConfigService;
 import com.huiju.estateagents.service.ITaAdvancedControllerService;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaWxPayConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +47,8 @@ public class SysAdvancedConfigController extends BaseController {
     @Autowired
     public ITaAdvancedControllerService taAdvancedControllerService;
 
+    @Autowired
+    public ITaMiniappService taMiniappService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -203,6 +207,10 @@ public class SysAdvancedConfigController extends BaseController {
                 });
             }
             if (null != wxPayData){
+                TaMiniapp taMiniapp = taMiniappService.getOne(new QueryWrapper<TaMiniapp>().eq("org_id", orgId));
+                if (!taMiniapp.getMiniappId().equals(wxPayData.get("appid"))){
+                    return ResponseBean.error("appid不一致", ResponseBean.ERROR_UNAVAILABLE);
+                }
                 //维护支付信息先删除后添加
                 taWxPayConfigService.remove(new QueryWrapper<TaWxPayConfig>().eq("org_id",orgId));
                 TaWxPayConfig taWxPayConfig = new TaWxPayConfig();

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.entity.*;
@@ -60,6 +61,12 @@ public class TaRaiseRecordController extends BaseController {
     @Autowired
     public ITaRaiseService taRaiseService;
 
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    public ITaUserService taUserService;
+
     /**
      * 条件查询房源认筹记录
      *
@@ -485,7 +492,9 @@ public class TaRaiseRecordController extends BaseController {
 
             //认筹表数据
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
-            taRaise.setRaisePrice(taRaise.getRaisePrice()/100);
+            taRaise.setRaisePrice(taRaise.getRaisePrice());
+            //置业顾问信息
+            taRaiseRecord.setConsultantInfo(taUserService.getById(taRaiseRecord.getUserId()));
             //房源与认筹单关系图
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
 
@@ -500,16 +509,27 @@ public class TaRaiseRecordController extends BaseController {
                         e.setMineLocked("mine");
                     }
                 });
+
+                //塞入户型信息
+                if (!StringUtils.isEmpty(e.getApartmentId())){
+                    TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
+                    e.setApartmentName(buildingApartment.getApartmentName());
+                    e.setInsideArea(buildingApartment.getInsideArea());
+                    e.setBuildingArea(buildingApartment.getBuildingArea());
+                }
             });
 
             //订单信息
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
+            //退费信息
+            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id",taOrder.getOrderId()));
 
             Map<String, Object> map = new HashMap<>();
             map.put("taRaiseRecord", taRaiseRecord);
             map.put("taRaiseHouseList", taRaiseHouseList);
             map.put("houseList", houseList);
             map.put("taOrder", taOrder);
+            map.put("refundOrder", refundOrder);
             map.put("taRaise", taRaise);
             responseBean.addSuccess(map);
         } catch (Exception e) {

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

@@ -175,7 +175,7 @@ public class WxPayController extends BaseController {
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            wxPayService.payRefund(taOrder,getOrgId(request),getUserId(request));
+            wxPayService.payRefund(taOrder,getOrgId(request),getOrgId(request));
         } catch (Exception e) {
             log.error("微信批量退款失败： {}" , e.getMessage());
             responseBean.addError(e.getMessage());

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

@@ -125,6 +125,12 @@ public class TaHousingResources implements Serializable {
     @TableField(exist = false)
     private String apartmentName;
 
+    @TableField(exist = false)
+    private Double insideArea;
+
+    @TableField(exist = false)
+    private Double buildingArea;
+
     /**
      * 状态
      */

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -226,4 +227,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private List<TaBuildingImg> apartMentList = new ArrayList<>();
+
+    /**
+     * 置业顾问信息
+     */
+    @TableField(exist = false)
+    private TaUser consultantInfo;
 }

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

@@ -20,10 +20,6 @@ import java.util.List;
 @Accessors(chain = true)
 public class TaHousingResourcesPO extends TaHousingResources {
 
-    private Double insideArea;
-
-    private Double buildingArea;
-
     /**
      * 是否已经预选该房源，true 是 false 否
      */

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

@@ -151,6 +151,7 @@ public class WxPayServiceImpl implements IWxPayService {
      */
     @Override
     public void payRefund(TaOrder taOrder, Integer orgId, Integer userId) throws Exception {
+        taOrder.setOrgId(orgId);
         //构建微信配置
         WxConfig config = getWxConfig(taOrder.getOrgId());
         WXPay wxpay = new WXPay(config);

src/main/resources/mapper/TaPersonMapper.xml

@@ -8,6 +8,7 @@
             t.company,
             t.department,
             t.post,
+            t.user_id as userId,
             t.tel AS phone,
             t.avatarurl AS avatar,
             t.photo,
@@ -135,6 +136,7 @@ FROM
         t.company,
         t.department,
         t.post,
+        t.user_id as userId,
         t.tel AS phone,
         t.avatarurl AS avatar,
         t.photo,