Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -865,7 +865,7 @@ public class CommConstant {
     /**
      * 明细类型--红包
      */
-    public static final String ITEM_TYPE_REDPACKAGE = "redPacket";
+    public static final String ITEM_TYPE_REDPACKAGE = "RedPacket";
 
     /**
      * 交易状态 成功

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

@@ -68,6 +68,19 @@ public class CommonUtils {
      */
     public static Double fenToYuan(Integer money) {
         return Double.parseDouble(BigDecimal.valueOf(Long.valueOf(money)).divide(new BigDecimal(100)).toString());
+    }
 
+    /**
+     * double减法运算,防止直接相减失去精度
+     *
+     * @param m1 减数
+     * @param m2 被减数
+     * @return
+     */
+    public static Double subDouble(double m1, double m2) {
+        BigDecimal p1 = new BigDecimal(Double.toString(m1));
+        BigDecimal p2 = new BigDecimal(Double.toString(m2));
+        return p1.subtract(p2).doubleValue();
     }
+
 }

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

@@ -115,6 +115,7 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
                     taRedPacket.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
                     iTaRedPacketService.initializeRedPacket(taRedPacket);
 
+                    taDrainage.setH5Address(String.format(taH5Template.getActivityUrl(), activityId));
                     taDrainage.setActivityType(taH5Template.getActivityType());
                     taDrainage.setActivityId(activityId);
                 }

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

@@ -81,4 +81,9 @@ public class TaOrg implements Serializable {
      */
     @TableField(exist = false)
     private String channelProxyName;
+
+    /**
+     * 短地址
+     */
+    private String shortId;
 }

src/main/java/com/huiju/estateagents/excel/redPacket/AccountConsumeRecordExport.java

@@ -42,6 +42,6 @@ public class AccountConsumeRecordExport {
     private String phone;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费状态", index = 5)
+    @ExcelProperty(value = "消费状态", index = 6)
     private String consumeStatus;
 }

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketRankingListExport.java

@@ -13,31 +13,25 @@ import lombok.Data;
 @Data
 public class RedPacketRankingListExport {
 
-
-    @ColumnWidth(15)
-    @ExcelProperty(value = "头像", index = 0)
-    private String avatarurl;
-
-
     @ColumnWidth(15)
-    @ExcelProperty(value = "昵称", index = 1)
+    @ExcelProperty(value = "昵称", index = 0)
     private String nickname;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 1)
     private String name;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "手机号", index = 3)
+    @ExcelProperty(value = "手机号", index = 2)
     private String phone;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "发起时间", index = 4)
+    @ExcelProperty(value = "发起时间", index = 3)
     private String createDate;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "助力人数", index = 5)
+    @ExcelProperty(value = "助力人数", index = 4)
     private String votes;
 }

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketVisitRecordtExport.java

@@ -13,35 +13,29 @@ import lombok.Data;
 @Data
 public class RedPacketVisitRecordtExport {
 
-
-    @ColumnWidth(15)
-    @ExcelProperty(value = "头像", index = 0)
-    private String avatarurl;
-
-
     @ColumnWidth(15)
-    @ExcelProperty(value = "昵称", index = 1)
+    @ExcelProperty(value = "昵称", index = 0)
     private String nickname;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 1)
     private String name;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "手机号", index = 3)
+    @ExcelProperty(value = "手机号", index = 2)
     private String phone;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问时间", index = 4)
+    @ExcelProperty(value = "访问时间", index = 3)
     private String createDate;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "分享人昵称", index = 5)
+    @ExcelProperty(value = "分享人昵称", index = 4)
     private String sharePersonNickName;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "分享人手机号", index = 6)
+    @ExcelProperty(value = "分享人手机号", index = 5)
     private String sharePersonPhone;
 }

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

@@ -472,12 +472,12 @@ public class TaOrgOrderController extends BaseController {
      *
      * @param pageNum
      * @param pageSize
-     * @param startTime   消费开始时间
-     * @param endTime     消费结束时间
-     * @param orderId     订单编号
-     * @param status      消费状态，1：成功，0：失败
-     * @param consumeType 消费方式，红包：redPacket
-     * @param phone       接收人手机号
+     * @param startTime     消费开始时间
+     * @param endTime       消费结束时间
+     * @param orderId       订单编号
+     * @param tradingStatus success:成功；fail:失败
+     * @param consumeType   消费方式，红包：redPacket
+     * @param phone         接收人手机号
      * @param request
      * @return
      */
@@ -489,13 +489,13 @@ public class TaOrgOrderController extends BaseController {
                                                     String orderId,
                                                     String wxOrderId,
                                                     String tradeNo,
-                                                    Integer status,
+                                                    String tradingStatus,
                                                     String consumeType,
                                                     String phone,
                                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, getOrgId(request));
+            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, getOrgId(request));
         } catch (Exception e) {
             logger.error("listConsumeOrderByCondition -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -510,7 +510,7 @@ public class TaOrgOrderController extends BaseController {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus success:成功；fail:失败
      * @param consumeType
      * @param phone
      * @param request
@@ -523,13 +523,13 @@ public class TaOrgOrderController extends BaseController {
                                               String orderId,
                                               String wxOrderId,
                                               String tradeNo,
-                                              Integer status,
+                                              String tradingStatus,
                                               String consumeType,
                                               String phone,
                                               HttpServletRequest request,
                                               HttpServletResponse response) throws Exception {
         try {
-            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, getOrgId(request), response);
+            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, getOrgId(request), response);
         } catch (Exception e) {
             logger.error("exportConsumeOrderByCondition 异常：", e);
             response.reset();

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

@@ -168,7 +168,7 @@ public class TaRedPacketController extends BaseController {
      * @param wxOrderId
      * @param tradeNo
      * @param phone
-     * @param status
+     * @param tradingStatus
      * @param request
      * @return
      */
@@ -180,11 +180,11 @@ public class TaRedPacketController extends BaseController {
                                        String wxOrderId,
                                        String tradeNo,
                                        String phone,
-                                       Integer status,
+                                       String tradingStatus,
                                        HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.listRedPacketRecords(pageNum, pageSize, phone, activityId, orderId, wxOrderId, tradeNo, status, getOrgId(request));
+            responseBean = iTaOrgOrderService.listRedPacketRecords(pageNum, pageSize, phone, activityId, orderId, wxOrderId, tradeNo, tradingStatus, getOrgId(request));
         } catch (Exception e) {
             logger.error("listSendRecord -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 红包金额设置  前端控制器
-    * </p>
+ * 红包金额设置  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-06-03
@@ -32,25 +32,26 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRedPacketMoney",method= RequestMethod.GET)
-    public ResponseBean taRedPacketMoneyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taRedPacketMoney", method = RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaRedPacketMoney> pg = new Page<>(pageNum, pageSize);
+            IPage<TaRedPacketMoney> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRedPacketMoney> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRedPacketMoney> result = iTaRedPacketMoneyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyList -=- {}",e.toString());
+            logger.error("taRedPacketMoneyList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +59,22 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRedPacketMoney 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacketMoney",method= RequestMethod.POST)
-    public ResponseBean taRedPacketMoneyAdd(@RequestBody TaRedPacketMoney taRedPacketMoney){
+    @RequestMapping(value = "/taRedPacketMoney", method = RequestMethod.POST)
+    public ResponseBean taRedPacketMoneyAdd(@RequestBody TaRedPacketMoney taRedPacketMoney) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRedPacketMoneyService.save(taRedPacketMoney)){
+            if (iTaRedPacketMoneyService.save(taRedPacketMoney)) {
                 responseBean.addSuccess(taRedPacketMoney);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyAdd -=- {}",e.toString());
+            logger.error("taRedPacketMoneyAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +82,22 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRedPacketMoney/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRedPacketMoneyDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taRedPacketMoney/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketMoneyDelete(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRedPacketMoneyService.removeById(id)){
+            if (iTaRedPacketMoneyService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyDelete -=- {}",e.toString());
+            logger.error("taRedPacketMoneyDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,19 +105,20 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id               实体ID
      * @param taRedPacketMoney 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/redPacket/money/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRedPacketMoneyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRedPacketMoney taRedPacketMoney){
+    @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRedPacketMoneyUpdate(@PathVariable("id") String id, @RequestBody TaRedPacketMoney taRedPacketMoney) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taRedPacketMoney.setActivityId(id);
             responseBean = iTaRedPacketMoneyService.updateRedPacketMoney(taRedPacketMoney);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyUpdate -=- {}",e.toString());
+            logger.error("taRedPacketMoneyUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -122,16 +126,17 @@ public class TaRedPacketMoneyController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/redPacket/money/{id}",method= RequestMethod.GET)
-    public ResponseBean taRedPacketMoneyGet(@PathVariable String id){
+    @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyGet(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaRedPacketMoneyService.getRedPacketMoneyById(id);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketMoneyDelete -=- {}",e.toString());
+            logger.error("taRedPacketMoneyDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -58,5 +58,8 @@ public class TaH5Template implements Serializable {
      */
     private Integer status;
 
-
+    /**
+     * 活动地址
+     */
+    private String activityUrl;
 }

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

@@ -66,8 +66,26 @@ public class TaRedPacketMoney implements Serializable {
     private String insufficientBalanceTip;
 
     /**
-     * 红包客户端消息通知
+     * 商户名称
      */
     @TableField(exist = false)
-    private TaRedPacketClient taRedPacketClient;
+    private String mchName;
+
+    /**
+     * 红包祝福语
+     */
+    @TableField(exist = false)
+    private String blessing;
+
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
+
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

@@ -210,7 +210,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                            @Param("orderId") String orderId,
                                            @Param("wxOrderId") String wxOrderId,
                                            @Param("tradeNo") String tradeNo,
-                                           @Param("status") Integer status,
+                                           @Param("tradingStatus") String tradingStatus,
                                            @Param("orgId") Integer orgId);
 
     /**
@@ -220,7 +220,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
@@ -230,7 +230,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                   @Param("startTime") LocalDate startTime,
                                                   @Param("endTime") LocalDate endTime,
                                                   @Param("orderId") String orderId,
-                                                  @Param("status") Integer status,
+                                                  @Param("tradingStatus") String tradingStatus,
                                                   @Param("consumeType") String consumeType,
                                                   @Param("phone") String phone,
                                                   @Param("wxOrderId") String wxOrderId,
@@ -243,7 +243,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
@@ -252,7 +252,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
     List<AccountConsumeRecordExport> exportConsumeOrderByCondition(@Param("startTime") LocalDate startTime,
                                                                    @Param("endTime") LocalDate endTime,
                                                                    @Param("orderId") String orderId,
-                                                                   @Param("status") Integer status,
+                                                                   @Param("tradingStatus") String tradingStatus,
                                                                    @Param("consumeType") String consumeType,
                                                                    @Param("phone") String phone,
                                                                    @Param("wxOrderId") String wxOrderId,

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

@@ -172,11 +172,11 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param orderId
      * @param wxOrderId
      * @param tradeNo
-     * @param status
+     * @param tradingStatus
      * @param orgId
      * @return
      */
-    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
+    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, String tradingStatus, Integer orgId);
 
     /**
      * 获取消费订单列表
@@ -186,13 +186,13 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
      * @return
      */
-    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status,
+    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus,
                                              String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId);
 
     /**
@@ -201,12 +201,12 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
      * @param response
      * @throws Exception
      */
-    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
 }

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

@@ -228,6 +228,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         // 计算退款冻结金额
         orgAccount.setRefundBlockedAmount(taOrgRefundApplicationMapper.countRefundBlockedAmount(orgId));
+        orgAccount.setTotalRechargeAmount(taOrgOrderMapper.countTotalRechargeAmount(orgId));
         responseBean.addSuccess(orgAccount);
         return responseBean;
     }

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

@@ -82,6 +82,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     @Autowired
     private TaOrgAccountCertificateMapper taOrgAccountCertificateMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     @Autowired
     private SysUserMapper sysUserMapper;
 
@@ -177,14 +180,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
-        SysUser taUser = sysUserMapper.selectById(userId);
+        TaUser taUser = taUserMapper.selectById(userId);
         if (taUser == null) {
             responseBean.addError("fail");
             return responseBean;
         }
 
         // 计算支付金额
-        Double realAmount = amount * (1 + CommConstant.WXMCH_PAY_RATE);
+        Double realAmount = Math.ceil(amount * (1 + CommConstant.WXMCH_PAY_RATE) * 100) / 100;
 
         // 1.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
@@ -228,7 +231,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         JSONObject obj = new JSONObject();
         obj.put("amount", amount);
         obj.put("realAmount", realAmount);
-        obj.put("serviceFee", amount * CommConstant.WXMCH_PAY_RATE);
+        obj.put("serviceFee", CommonUtils.subDouble(realAmount, amount));
         obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE_STRING);
         obj.put("payQrCode", payResult.getData());
         obj.put("orderInfo", taOrgOrder);
@@ -241,13 +244,29 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
-        SysUser taUser = sysUserMapper.selectById(userId);
+        TaUser taUser = taUserMapper.selectById(userId);
         if (taUser == null) {
             responseBean.addError("fail");
             return responseBean;
         }
 
-        // 1.创建订单主表信息
+        // 查询账户信息
+        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
+        orgAccountQueryWrapper.eq("org_id",orgId);
+        orgAccountQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(orgAccountQueryWrapper);
+        if(taOrgAccount == null){
+            responseBean.addError("账户不存在");
+            return responseBean;
+        }
+
+        // 1.校验账户金额
+        if(amount > CommonUtils.fenToYuan(taOrgAccount.getAvailableBalance())){
+            responseBean.addError("账户可用余额不足，请稍后再试");
+            return responseBean;
+        }
+
+        // 2.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.REFUND));
@@ -265,7 +284,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 2.创建订单详情表信息
+        // 3.创建订单详情表信息
         TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
         taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
         taOrgOrderDetail.setOrgId(orgId);
@@ -280,7 +299,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 3.创建账户退款申请表信息
+        // 4.创建账户退款申请表信息
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
@@ -360,26 +379,26 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId) {
+    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, String tradingStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg, phone, activityId, orderId, wxOrderId, tradeNo, status, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg, phone, activityId, orderId, wxOrderId, tradeNo, tradingStatus, orgId));
         return responseBean;
     }
 
     @Override
-    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId) {
+    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, orgId));
         return responseBean;
     }
 
     @Override
-    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, wxOrderId, tradeNo, phone, orgId);
+        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, tradingStatus, consumeType, wxOrderId, tradeNo, phone, orgId);
         String fileName = URLEncoder.encode("消费订单", "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         EasyExcel.write(response.getOutputStream(), AccountConsumeRecordExport.class).sheet("消费订单").doWrite(records);

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.service.impl;
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.redpack.entity.TaRedPacketClient;
 import com.huiju.estateagents.redpack.entity.TaRedPacketMoney;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketMoneyMapper;
@@ -37,7 +38,12 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
 
         // 获取红包客户端消息配置
         TaRedPacketClient taRedPacketClient = iTaRedPacketClientService.getById(activityId);
-        taRedPacketMoney.setTaRedPacketClient(taRedPacketClient);
+        if (taRedPacketClient != null) {
+            taRedPacketMoney.setMchName(taRedPacketClient.getMchName());
+            taRedPacketMoney.setActivityName(taRedPacketClient.getActivityName());
+            taRedPacketMoney.setBlessing(taRedPacketClient.getBlessing());
+            taRedPacketMoney.setRemark(taRedPacketClient.getRemark());
+        }
         responseBean.addSuccess(taRedPacketMoney);
         return responseBean;
     }
@@ -49,7 +55,17 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
         // 更新红包金额设置
         updateById(taRedPacketMoney);
         // 更新红包客户端消息配置
-        iTaRedPacketClientService.updateById(taRedPacketMoney.getTaRedPacketClient());
+        if (!StringUtils.isEmpty(taRedPacketMoney.getActivityName()) || !StringUtils.isEmpty(taRedPacketMoney.getMchName())
+                || !StringUtils.isEmpty(taRedPacketMoney.getBlessing()) || !StringUtils.isEmpty(taRedPacketMoney.getRemark())){
+            TaRedPacketClient taRedPacketClient = new TaRedPacketClient();
+            taRedPacketClient.setActivityId(taRedPacketMoney.getActivityId());
+            taRedPacketClient.setMchName(taRedPacketMoney.getMchName());
+            taRedPacketClient.setActivityName(taRedPacketMoney.getActivityName());
+            taRedPacketClient.setBlessing(taRedPacketMoney.getBlessing());
+            taRedPacketClient.setRemark(taRedPacketMoney.getRemark());
+            iTaRedPacketClientService.updateById(taRedPacketClient);
+        }
+
         responseBean.addSuccess("success");
         return responseBean;
     }

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

@@ -85,20 +85,20 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
         h5ImagesQueryWrapper.eq("activity_id", record.getActivityId());
         List<TaH5Images> h5ImagesList = taH5ImagesMapper.selectList(h5ImagesQueryWrapper);
         h5ImagesList.stream().forEach(r -> {
-            switch (r.getActivityType()) {
-                case "rp_share_post_img":
+            switch (r.getImageType()) {
+                case "RedPacket.rp_share_post_img":
                     record.setSharePosterImg(r.getImageUrl());
                     break;
-                case "rp_activity_rules_img":
+                case "RedPacket.rp_activity_rules_img":
                     record.setActivityRulesImg(r.getImageUrl());
                     break;
-                case "rp_help_background_img":
+                case "RedPacket.rp_help_background_img":
                     record.setHelpBackgroundImg(r.getImageUrl());
                     break;
-                case "rp_index_background_img":
+                case "RedPacket.rp_index_background_img":
                     record.setIndexBackgroundImg(r.getImageUrl());
                     break;
-                case "rp_ranking_background_img":
+                case "RedPacket.rp_ranking_background_img":
                     record.setRankingBackgroundImg(r.getImageUrl());
                     break;
                 default:

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 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;
@@ -233,7 +234,7 @@ public class TaContactController extends BaseController {
     @RequestMapping(value = "/admin/listContactByCondition", method = RequestMethod.GET)
     public ResponseBean listContactByConditionForAdmin(@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) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -243,7 +244,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.like(!StringUtils.isEmpty(contactType), "contact_type", contactType);
+            queryWrapper.like("contact_type", CommConstant.FINANCE);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 
@@ -259,10 +260,11 @@ public class TaContactController extends BaseController {
 
     /**
      * 新增财务联系人
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/channel/taContactFinance/{id}",method= RequestMethod.PUT)
-    public ResponseBean taContactInfoAdd(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taContactFinance/{id}", method = RequestMethod.PUT)
+    public ResponseBean taContactInfoAdd(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaContact taContact = new TaContact();
@@ -273,9 +275,9 @@ public class TaContactController extends BaseController {
             } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactInfoAdd -=- {}",e.toString());
+            logger.error("taContactInfoAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -284,8 +286,8 @@ public class TaContactController extends BaseController {
     /**
      * 删除财务联系人
      */
-    @RequestMapping(value="/channel/taContactFinanceDel",method= RequestMethod.PUT)
-    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts){
+    @RequestMapping(value = "/channel/taContactFinanceDel", method = RequestMethod.PUT)
+    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taContacts.forEach(e -> {
@@ -296,9 +298,9 @@ public class TaContactController extends BaseController {
             } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactInfoAdd -=- {}",e.toString());
+            logger.error("taContactInfoAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -202,7 +202,7 @@
             <if test = " payEndTime != null ">
                 AND t.pay_date &lt;= #{payEndTime}
             </if>
-            <if test = " tradingStatus != null">
+            <if test = " tradingStatus != null and tradingStatus != ''">
                 AND t.trading_status = #{tradingStatus}
             </if>
         ORDER BY
@@ -241,7 +241,7 @@
             <if test = " payEndTime != null ">
                 AND t.pay_date &lt;= #{payEndTime}
             </if>
-            <if test = " tradingStatus != null">
+            <if test = " tradingStatus != null and tradingStatus != '' ">
                 AND t.trading_status = #{tradingStatus}
             </if>
         ORDER BY
@@ -350,8 +350,8 @@
             <if test = " wxOrderId != null and wxOrderId != ''">
                 AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
             </if>
-            <if test="status != null">
-                AND t.status = #{status}
+            <if test="tradingStatus != null and tradingStatus != ''">
+                AND t.trading_status = #{tradingStatus}
             </if>
             <if test = "phone != null and phone != ''">
                 AND t3.phone like concat ('%',phone,'%')
@@ -395,11 +395,16 @@
             <if test = " endTime != null">
                 AND t.create_date &lt;= #{endTime}
             </if>
-            <if test = " status != null">
-                AND t2.status = #{status}
-            </if>
+            <choose>
+                <when test="tradingStatus == 'success'">
+                    AND t.trading_status = 'success'
+                </when>
+                <when test = "tradingStatus == 'fail'">
+                    AND t.trading_status == 'fail'
+                </when>
+            </choose>
             <if test = "phone != null and phone != ''">
-                AND t3.phone = #{phone}
+                AND t3.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
             t.create_date DESC
@@ -445,11 +450,16 @@
             <if test = " endTime != null">
                 AND t.create_date &lt;= #{endTime}
             </if>
-            <if test = " status != null">
-                AND t2.status = #{status}
-            </if>
+            <choose>
+                <when test="tradingStatus == 'success'">
+                    AND t.trading_status = 'success'
+                </when>
+                <when test = "tradingStatus == 'fail'">
+                    AND t.trading_status == 'fail'
+                </when>
+            </choose>
             <if test = "phone != null and phone != ''">
-                AND t3.phone = #{phone}
+                AND t3.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
             t.create_date DESC

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

@@ -10,7 +10,8 @@
             ta_org_refund_application t
         WHERE
             t.org_id = #{orgId}
-            AND t.`status` = 0
+            AND t.`status` = 1
+            AND t.audit_status = 'checking'
     </select>
 
 </mapper>

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

@@ -151,7 +151,7 @@
 
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
         SELECT
-        t.create_date
+        t.create_date,
         t2.nickname,
         t2.NAME,
         t2.avatarurl,

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

@@ -26,7 +26,7 @@
     <select id="exportRedPacketRankingList" resultType="com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport">
         SELECT
             t.votes,
-            t.crate_date,
+            t.create_date,
             t2.phone,
             t2.NAME,
             t2.nickname nickname,