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

src/main/java/com/huiju/estateagents/redpack/controller/TaH5TemplateController.java

@@ -55,7 +55,7 @@ public class TaH5TemplateController extends BaseController {
 		    IPage<TaH5Template> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Template> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(h5TemplateId), "h5_template_id", h5TemplateId);
-            queryWrapper.eq(!StringUtils.isEmpty(name), "name", name);
+            queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaH5Template> result = iTaH5TemplateService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountController.java

@@ -187,9 +187,8 @@ public class TaOrgAccountController extends BaseController {
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            Integer orgId = getOrgId(request);
             Integer userId = getUserId(request);
-            iTaOrgAccountService.rechargeAccount(id, taOrgAccount, 26, 2149);
+            iTaOrgAccountService.rechargeAccount(id, taOrgAccount, taOrgAccount.getOrgId(), userId);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taOrgAccountRecharge -=- {}", e.toString());
@@ -211,9 +210,8 @@ public class TaOrgAccountController extends BaseController {
                                            HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            Integer orgId = getOrgId(request);
             Integer userId = getUserId(request);
-            responseBean = iTaOrgAccountService.refundAccount(id, taOrgAccount, 26, 2149);
+            responseBean = iTaOrgAccountService.refundAccount(id, taOrgAccount, taOrgAccount.getOrgId(), userId);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taOrgAccountRefund -=- {}", e.toString());
@@ -236,7 +234,7 @@ public class TaOrgAccountController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer userId = getUserId(request);
-            responseBean = iTaOrgOrderService.refundOrder(id, refundApplication, 2149);
+            responseBean = iTaOrgOrderService.refundOrder(id, refundApplication, userId);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taOrgAccountRefund -=- {}", e.toString());
@@ -259,7 +257,7 @@ public class TaOrgAccountController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer userId = getUserId(request);
-            responseBean = iTaOrgOrderService.rejectOrder(id, refundApplication, 2149);
+            responseBean = iTaOrgOrderService.rejectOrder(id, refundApplication, userId);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taOrgAccountRefund -=- {}", e.toString());

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

@@ -231,13 +231,15 @@ public class TaOrgOrderController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/channel/receiveInfo/{id}", method = RequestMethod.GET)
-    public ResponseBean receiveInfoGet(@PathVariable String id, HttpServletRequest request) {
+    @RequestMapping(value = "/channel/receiveInfo", method = RequestMethod.GET)
+    public ResponseBean receiveInfoGet(@RequestParam(required = false) String phone,
+                                       @RequestParam(required = false) Integer orgId,
+                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-            taPersonQueryWrapper.eq("phone", id);
-            taPersonQueryWrapper.eq("org_id", getOrgId(request));
+            taPersonQueryWrapper.eq("phone", phone);
+            taPersonQueryWrapper.eq("org_id", orgId);
             responseBean.addSuccess(iTaPersonService.getOne(taPersonQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrder.java

@@ -101,6 +101,12 @@ public class TaOrgOrder implements Serializable {
     @TableField(exist = false)
     private String miniAppName;
 
+    @TableField(exist = false)
+    private String certificateUrl;
+
+    @TableField(exist = false)
+    private List<String> certificateUrlList;
+
     @TableField(exist = false)
     private List<TaOrgAccountCertificate> certificateList;
 
@@ -142,4 +148,10 @@ public class TaOrgOrder implements Serializable {
      */
     @TableField(exist = false)
     private String activityName;
+
+    /**
+     * 账户实际余额
+     */
+    @TableField(exist = false)
+    private Integer realBalance;
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.ss.formula.functions.T;
@@ -73,7 +75,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
     private TaOrgRefundApplicationMapper taOrgRefundApplicationMapper;
 
     @Autowired
-    private TaUserMapper taUserMapper;
+    private SysUserMapper sysUserMapper;
 
     @Autowired
     private ITaOrgOrderService iTaOrgOrderService;
@@ -110,7 +112,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         int taOrgOrderDetailInsertResult = taOrgOrderDetailMapper.insert(taOrgOrderDetail);
 
         //新增账户消费流水记录
-        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(orgId, taOrgAccount, taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_RECHARGE);
+        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(accountId, orgId, taOrgAccount, taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_RECHARGE);
         int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //插入凭证记录
@@ -128,10 +130,10 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
             return responseBean;
         }
 
-        TaContact taContact = selectSmsContactUser();
-        String[] smsParams = {"业务平台充值成功", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
-        // 短信发送
-        sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
+//        TaContact taContact = selectSmsContactUser();
+//        String[] smsParams = {"业务平台充值成功", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
+//        // 短信发送
+//        sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
 
         return responseBean;
     }
@@ -159,7 +161,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         int taOrgOrderDetailInsertResult = taOrgOrderDetailMapper.insert(taOrgOrderDetail);
 
         //新增账户消费流水
-        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(orgId, taOrgAccount, taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
+        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(accountId, orgId, taOrgAccount, taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
         int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //插入凭证记录
@@ -253,7 +255,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
      * @return
      */
     public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
-        TaUser taUser = selectUserById(userId);
+        SysUser taUser = selectUserById(userId);
         List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
 
         taOrgAccount.getCertificateList().forEach(e -> {
@@ -284,7 +286,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
      */
     private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId, String consumeType) {
 
-        TaUser taUser = selectUserById(userId);
+        SysUser taUser = selectUserById(userId);
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? CommConstant.RECHARGE : CommConstant.REFUND));
@@ -328,11 +330,11 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
      * @param userId
      * @return
      */
-    private TaOrgAccountDetailedList assembleAccountDetailList(Integer orgId, TaOrgAccount taOrgAccount, String orderId, Integer userId, String consumeType) {
+    private TaOrgAccountDetailedList assembleAccountDetailList(String accountId, Integer orgId, TaOrgAccount taOrgAccount, String orderId, Integer userId, String consumeType) {
 
-        TaUser taUser = selectUserById(userId);
+        SysUser taUser = selectUserById(userId);
         TaOrgAccountDetailedList taOrgAccountDetailed = new TaOrgAccountDetailedList();
-        taOrgAccountDetailed.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountDetailed.setAccountId(accountId);
         taOrgAccountDetailed.setOrgId(orgId);
         taOrgAccountDetailed.setAmount(CommConstant.ITEM_TYPE_RECHARGE.equals(consumeType) ? taOrgAccount.getRechargeAmount() : taOrgAccount.getRefundAmount());
         //1收入,-1支出
@@ -372,11 +374,11 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         return selectOneAccount;
     }
 
-    public TaUser selectUserById(Integer userId) {
+    public SysUser selectUserById(Integer userId) {
         //获取操作人
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-        taUserQueryWrapper.eq("user_id", userId);
-        TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_id", userId);
+        SysUser taUser = sysUserMapper.selectOne(sysUserQueryWrapper);
         return taUser;
     }
 

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -7,10 +7,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.wxpay.WXPay;
 import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WxConfig;
@@ -38,6 +41,7 @@ import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -79,7 +83,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     private TaOrgAccountCertificateMapper taOrgAccountCertificateMapper;
 
     @Autowired
-    private TaUserMapper taUserMapper;
+    private SysUserMapper sysUserMapper;
 
     @Autowired
     private TaWxPayConfigMapper taWxPayConfigMapper;
@@ -90,6 +94,11 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
+            result.getRecords().forEach(e -> {
+                if (!StringUtils.isEmpty(e.getCertificateUrl())){
+                    e.setCertificateUrlList(Arrays.asList(e.getCertificateUrl().split(",")));
+                }
+            });
             return result;
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
             result = taOrgOrderMapper.orderListByConsume(pg, orderType, orgId, tradeNo, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
@@ -164,7 +173,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
-        TaUser taUser = taUserMapper.selectById(userId);
+        SysUser taUser = sysUserMapper.selectById(userId);
         if (taUser == null) {
             responseBean.addError("fail");
             return responseBean;
@@ -228,7 +237,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
-        TaUser taUser = taUserMapper.selectById(userId);
+        SysUser taUser = sysUserMapper.selectById(userId);
         if (taUser == null) {
             responseBean.addError("fail");
             return responseBean;
@@ -418,26 +427,26 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         TaOrgAccount taOrgAccount = assembleRefundAccount(refundApplication.getOrgId(), refundApplication, CommConstant.ITEM_TYPE_REFUND);
         taOrgAccountMapper.updateById(taOrgAccount);
 
-        //新增订单记录
-        TaOrgOrder taOrgOrder = assembleTaOrgOrder(refundApplication.getOrgId(), taOrgAccount.getRechargeAmount(), userId);
-        int taOrgOrderInsertResult = taOrgOrderMapper.insert(taOrgOrder);
+        //更新订单记录
+        TaOrgOrder taOrgOrder = assembleTaOrgOrder(id);
+        taOrgOrderMapper.updateById(taOrgOrder);
 
-        //新增关联订单明细
-        TaOrgOrderDetail taOrgOrderDetail = assembleTaOrgOrderDetail(taOrgOrder.getOrderId(), refundApplication.getOrgId(), taOrgAccount.getRechargeAmount());
-        int taOrgOrderDetailInsertResult = taOrgOrderDetailMapper.insert(taOrgOrderDetail);
+//        //更新关联订单明细
+//        TaOrgOrderDetail taOrgOrderDetail = assembleTaOrgOrderDetail(taOrgOrder.getOrderId(), refundApplication.getOrgId(), taOrgAccount.getRechargeAmount());
+//        int taOrgOrderDetailInsertResult = taOrgOrderDetailMapper.insert(taOrgOrderDetail);
 
         //新建账户消费流水
-        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(refundApplication, userId);
-        int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
+        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(id, refundApplication, userId);
+        taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
         //更新账户退款申请
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
-        int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
+        taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
-        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication);
+        updateOrgAccountBlock(refundApplication);
 
         //插入凭证记录
         if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())) {
@@ -447,14 +456,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             });
         }
 
-        if (taOrgOrderInsertResult < 1 ||
-                taOrgOrderDetailInsertResult < 1 ||
-                taOrgAccountDetailedListInsertResult < 1 ||
-                taOrgRefundApplicationUpdateResult < 1 ||
-                taOrgAccountBlockedUpdateResult < 1) {
-            responseBean.addError("订单退款失败");
-            return responseBean;
-        }
+//        if (taOrgOrderInsertResult < 1 ||
+//                taOrgAccountDetailedListInsertResult < 1 ||
+//                taOrgRefundApplicationUpdateResult < 1 ||
+//                taOrgAccountBlockedUpdateResult < 1) {
+//            responseBean.addError("订单退款失败");
+//            return responseBean;
+//        }
 
         return responseBean;
     }
@@ -477,8 +485,15 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgRefundApplicationQueryWrapper.eq("org_id", refundApplication.getOrgId());
         int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
+        //更新订单状态
+        TaOrgOrder taOrgOrder = new TaOrgOrder();
+        taOrgOrder.setOrderId(id);
+        taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_FAIL);
+        int taOrgOrderUpdateResult = taOrgOrderMapper.updateById(taOrgOrder);
+
         if (taOrgAccountBlockedUpdateResult < 1 ||
-                taOrgRefundApplicationUpdateResult < 1) {
+                taOrgRefundApplicationUpdateResult < 1 ||
+                taOrgOrderUpdateResult < 1) {
             responseBean.addError("驳回失败");
             return responseBean;
         }
@@ -517,25 +532,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     /**
      * 构造订单
      *
-     * @param orgId
-     * @param amount
-     * @param userId
      * @return
      */
-    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId) {
+    private TaOrgOrder assembleTaOrgOrder(String orderId) {
 
-        TaUser taUser = selectUserById(userId);
         TaOrgOrder taOrgOrder = new TaOrgOrder();
-        taOrgOrder.setOrgId(orgId);
-        taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.RECHARGE));
-        taOrgOrder.setAmount(amount);
-        taOrgOrder.setCreateDate(LocalDateTime.now());
-        taOrgOrder.setExpiryDate(LocalDateTime.now());
-        taOrgOrder.setRemark("线下订单退费");
-        taOrgOrder.setTradingStatus(String.valueOf(CommConstant.STATUS_NORMAL));
-        taOrgOrder.setIsOffline(true);
-        taOrgOrder.setUserId(userId);
-        taOrgOrder.setUserName(taUser.getUserName());
+        taOrgOrder.setOrderId(orderId);
+        taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_SUCCESS);
 
         return taOrgOrder;
     }
@@ -566,9 +569,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @param userId
      * @return
      */
-    private TaOrgAccountDetailedList assembleAccountDetailList(TaOrgRefundApplication refundApplication, Integer userId) {
+    private TaOrgAccountDetailedList assembleAccountDetailList(String orderId, TaOrgRefundApplication refundApplication, Integer userId) {
 
-        TaUser taUser = selectUserById(userId);
+        SysUser taUser = selectUserById(userId);
         TaOrgAccount taOrgAccount = selectTaOrgAccountById(refundApplication.getOrgId());
 
         TaOrgAccountDetailedList taOrgAccountDetailed = new TaOrgAccountDetailedList();
@@ -578,7 +581,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         //1收入,-1支出
         taOrgAccountDetailed.setSignType(CommConstant.STATUS_DELETE);
         taOrgAccountDetailed.setRemark("线下订单退费");
-        taOrgAccountDetailed.setOrderId(refundApplication.getOrderId());
+        taOrgAccountDetailed.setOrderId(orderId);
         taOrgAccountDetailed.setUserId(userId);
         taOrgAccountDetailed.setUserName(taUser.getUserName());
 
@@ -596,7 +599,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @return
      */
     public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
-        TaUser taUser = selectUserById(userId);
+        SysUser taUser = selectUserById(userId);
         List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
 
         taOrgAccount.getCertificateList().forEach(e -> {
@@ -624,7 +627,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @return
      */
     private TaOrgRefundApplication assembleRefundApplication(Integer userId, String operateType, TaOrgRefundApplication refundApplication) {
-        TaUser taUser = selectUserById(userId);
+        SysUser taUser = selectUserById(userId);
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setAuditorId(userId);
         taOrgRefundApplication.setAuditorName(taUser.getUserName());
@@ -656,12 +659,12 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @param userId
      * @return
      */
-    public TaUser selectUserById(Integer userId) {
+    public SysUser selectUserById(Integer userId) {
         //获取操作人
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-        taUserQueryWrapper.eq("user_id", userId);
-        TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
-        return taUser;
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_id", userId);
+        SysUser sysUser = sysUserMapper.selectOne(sysUserQueryWrapper);
+        return sysUser;
     }
 
 }

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -53,7 +54,7 @@ public class TaContactController extends BaseController {
     @RequestMapping(value = "/channel/listContactByCondition", method = RequestMethod.GET)
     public ResponseBean listContactByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               String contactName, String telephone, String phone, String job, String contactType) {
+                                               String contactName, String telephone, String phone, String job, String listType) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -63,7 +64,7 @@ public class TaContactController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
             queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
             queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
-            queryWrapper.eq(!StringUtils.isEmpty(contactType), "contact_type", contactType);
+            queryWrapper.eq("contact_type", CommConstant.FINANCE);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 
@@ -281,4 +282,27 @@ public class TaContactController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 删除财务联系人
+     */
+    @RequestMapping(value="/channel/taContactFinanceDel",method= RequestMethod.PUT)
+    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taContacts.forEach(e -> {
+                e.setContactType(null);
+            });
+            if (iTaContactService.updateBatchById(taContacts)) {
+                responseBean.addSuccess(taContacts);
+            } else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContactInfoAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/sample/entity/TaContact.java

@@ -100,6 +100,7 @@ public class TaContact implements Serializable {
     /**
      * 联系人类型 此版本全部固定sample
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String contactType;
 
 

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -4,8 +4,11 @@
 
     <select id="orderListByRechargeOrRefund" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
         select
+        t.order_id,
+        t.org_id,
         t.trade_no,
         t.amount,
+        e.real_balance,
         b.name as miniAppName,
         t.is_offline,
         t.create_date,
@@ -14,11 +17,12 @@
             d.audit_status,
             d.audit_result,
         </if>
-        GROUP_CONCAT(c.url) as certificateList
+        GROUP_CONCAT(c.url) as certificateUrl
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
         left join ta_org_account_certificate c on t.order_id = c.order_id
+        left join ta_org_account e on t.org_id = e.org_id
         <if test="orderType == 'recharge' || orderType == 'refund'">
             left join ta_org_refund_application d on d.org_id = t.org_id
         </if>
@@ -50,6 +54,8 @@
 
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
         select
+        t.order_id,
+        t.org_id,
         t.trade_no,
         b.name as miniAppName,
         t.amount,