联调

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

@@ -14,6 +14,7 @@ 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.*;
+import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.service.*;
 import jodd.util.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -551,6 +553,11 @@ public class TaRaiseRecordController extends BaseController {
                     e.setApartmentName(buildingApartment.getApartmentName());
                     e.setInsideArea(buildingApartment.getInsideArea());
                     e.setBuildingArea(buildingApartment.getBuildingArea());
+                    //塞入户型图信息
+                    List<String> apartMentIds = new ArrayList<>();
+                    apartMentIds.add(e.getApartmentId());
+                    List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
+                    e.setApartmentImgList(apartMentList);
                 }
             });
 
@@ -610,7 +617,7 @@ public class TaRaiseRecordController extends BaseController {
                 List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(houseList.stream().map(TaHousingResources::getApartmentId).collect(Collectors.toList()));
                 e.setTaHousingResourcesList(houseList);
                 e.setTaHousingResourcesSize(houseList.size());
-                e.setApartMentList(apartMentList);
+                e.setBuildingImgList(apartMentList);
             });
 
             responseBean.addSuccess(page);

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

@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -179,4 +180,10 @@ public class TaHousingResources implements Serializable {
      */
     @TableField(exist = false)
     private String mineLocked;
+
+    /**
+     * 户型图列表列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> apartmentImgList = new ArrayList<>();
 }

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

@@ -226,7 +226,7 @@ public class TaRaiseRecord implements Serializable {
      * 户型图列表列表
      */
     @TableField(exist = false)
-    private List<TaBuildingImg> apartMentList = new ArrayList<>();
+    private List<TaBuildingImg> buildingImgList = new ArrayList<>();
 
     /**
      * 置业顾问信息

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

@@ -197,13 +197,15 @@ public class WxPayServiceImpl implements IWxPayService {
         List<TaOrder> orderList = taOrderMapper.selectList(new QueryWrapper<TaOrder>().eq("transaction_id", transactionId));
         orderList.forEach(e -> {
             e.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
-            taOrderMapper.updateById(e);
             if (null != e.getParentOrderId()){
                 //更新认筹单为退款
                 TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectOne(new QueryWrapper<TaRaiseRecord>().eq("order_id", e.getParentOrderId()));
                 taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
                 taRaiseRecordMapper.updateById(taRaiseRecord);
+                //更新退款时间
+                e.setPayTime(LocalDateTime.now());
             }
+            taOrderMapper.updateById(e);
         });
     }
 
@@ -288,7 +290,7 @@ public class WxPayServiceImpl implements IWxPayService {
             taOrder.setRefundNo("T"+refundOrder.getTradeNo());
             taOrder.setParentOrderId(refundOrder.getOrderId());
             taOrder.setOrgId(refundOrder.getOrgId());
-            taOrder.setPayTime(refundOrder.getPayTime());
+//            taOrder.setPayTime(refundOrder.getPayTime());
             taOrder.setPersonId(refundOrder.getPersonId());
             taOrder.setTradeNo(refundOrder.getTradeNo());
             taOrder.setTotalFee(refundOrder.getTotalFee());