* 功能优化

src/main/java/com/huiju/estateagents/bo/request/SaveCzOrderRequestBO.java

     /**
      * 充值金额
      */
-    private String amount;
+    private Integer amount;
 }

src/main/java/com/huiju/estateagents/bo/request/SaveRefundOrderRequestBO.java

     /**
      * 退款金额
      */
-    private String amount;
+    private Integer amount;
 }

src/main/java/com/huiju/estateagents/job/OrgOrderTimeJob.java

+package com.huiju.estateagents.job;//package com.huiju.estateagents.job;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * 订单相关操作
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class OrgOrderTimeJob extends BaseController {
+
+    private Logger logger = LoggerFactory.getLogger(OrgOrderTimeJob.class);
+
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    /**
+     * 处理过期订单
+     */
+    @Scheduled(cron = "* 0/5 * * * ?")
+    private void dealExpireOrder() {
+        logger.info("处理过期订单 定时任务开始");
+
+        try {
+            TaOrgOrder taOrgOrder = new TaOrgOrder();
+            taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_FAIL);
+
+            UpdateWrapper<TaOrgOrder> taOrgOrderUpdateWrapper = new UpdateWrapper<>();
+            taOrgOrderUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taOrgOrderUpdateWrapper.gt("expiry_date", LocalDateTime.now());
+            Integer result = taOrgOrderMapper.update(taOrgOrder, taOrgOrderUpdateWrapper);
+            logger.info("处理过期订单 共更新" + result + "条数据");
+        } catch (Exception e) {
+            logger.error("处理过期订单 异常", e);
+        }
+        logger.info("处理过期订单 定时任务结束");
+    }
+
+}

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

     public ResponseBean saveCzOrder(@RequestBody SaveCzOrderRequestBO requestBO, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.saveCzOrder(Double.parseDouble(requestBO.getAmount()), getOrgId(request), getUserId(request), request.getRemoteAddr());
+            responseBean = iTaOrgOrderService.saveCzOrder(requestBO.getAmount(), getOrgId(request), getUserId(request), request.getRemoteAddr());
         } catch (Exception e) {
             logger.error("saveCzOrder -=- {}", e);
             responseBean.addError(e.getMessage());
     public ResponseBean saveRefundOrder(@RequestBody SaveRefundOrderRequestBO requestBO, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.saveRefundOrder(Double.parseDouble(requestBO.getAmount()), getOrgId(request), getUserId(request));
+            responseBean = iTaOrgOrderService.saveRefundOrder(requestBO.getAmount(), getOrgId(request), getUserId(request));
         } catch (Exception e) {
             logger.error("refundOrder -=- {}", e);
             responseBean.addError(e.getMessage());

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

      */
     @TableField(exist = false)
     private Integer realBalance;
+
+    /**
+     * 实付金额
+     */
+    private Integer realAmount;
 }

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

      */
     private String receiverMpId;
 
-
+    /**
+     * 实付金额
+     */
+    private Integer realAmount;
 }

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

      * @return
      */
     Map<String, Object> getRedPacketSendInfo(@Param("targetType") String targetType,
-                                              @Param("targetId") String targetId,
-                                              @Param("orgId") Integer orgId);
+                                             @Param("targetId") String targetId,
+                                             @Param("orgId") Integer orgId);
 }

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

      * @param userId
      * @return
      */
-    ResponseBean saveCzOrder(Double amount, Integer orgId, Integer userId, String ip) throws Exception;
+    ResponseBean saveCzOrder(Integer amount, Integer orgId, Integer userId, String ip) throws Exception;
 
     /**
      * 创建退款订单
      * @param userId
      * @return
      */
-    ResponseBean saveRefundOrder(Double amount, Integer orgId, Integer userId);
+    ResponseBean saveRefundOrder(Integer amount, Integer orgId, Integer userId);
 
     /**
      * 获取充值订单列表

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

         WXPay wxpay = new WXPay(config);
 
         //获取支付的钱数并且判断是自动锁房还是手动锁房,自动锁房需要锁定房源，手动锁房跳过
-        String payPrice = String.valueOf(taOrgOrder.getAmount());
+        String payPrice = String.valueOf(taOrgOrder.getRealAmount());
 
         //生成商户订单
 //        String tradeNo = CommonUtils.generateTradeNo("CJ");
     }
 
     @Override
-    public ResponseBean saveCzOrder(Double amount, Integer orgId, Integer userId, String ip) throws Exception {
+    public ResponseBean saveCzOrder(Integer amount, Integer orgId, Integer userId, String ip) throws Exception {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
             return responseBean;
         }
 
-        // 计算支付金额
-        Double realAmount = Math.ceil(amount * (1 + CommConstant.WXMCH_PAY_RATE) * 100) / 100;
+        // 计算实付金额
+        Integer realAmount = calculateRealAmount(amount);
 
         // 1.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.RECHARGE));
-        taOrgOrder.setAmount(CommonUtils.yuanToFen(realAmount));
+        taOrgOrder.setAmount(amount);
+        taOrgOrder.setRealAmount(realAmount);
         taOrgOrder.setCreateDate(LocalDateTime.now());
-        taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(30));
+        taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(5));
         taOrgOrder.setRemark("线上充值");
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
         taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
         taOrgOrderDetail.setOrgId(orgId);
         taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_RECHARGE);
-        taOrgOrderDetail.setAmount(CommonUtils.yuanToFen(realAmount));
-        taOrgOrderDetail.setUnitPrice(CommonUtils.yuanToFen(realAmount));
+        taOrgOrderDetail.setAmount(amount);
+        taOrgOrderDetail.setUnitPrice(amount);
+        taOrgOrderDetail.setRealAmount(realAmount);
         taOrgOrderDetail.setQuantity(1);
         taOrgOrderDetail.setStatus(CommConstant.STATUS_NORMAL);
         if (taOrgOrderDetailMapper.insert(taOrgOrderDetail) < 1) {
         JSONObject obj = new JSONObject();
         obj.put("amount", amount);
         obj.put("realAmount", realAmount);
-        obj.put("serviceFee", CommonUtils.subDouble(realAmount, amount));
+        obj.put("serviceFee", realAmount - amount);
         obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE_STRING);
         obj.put("payQrCode", payResult.getData());
         obj.put("orderInfo", taOrgOrder);
     }
 
     @Override
-    public ResponseBean saveRefundOrder(Double amount, Integer orgId, Integer userId) {
+    public ResponseBean saveRefundOrder(Integer amount, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
         }
 
         // 1.校验账户金额
-        if (amount > CommonUtils.fenToYuan(taOrgAccount.getAvailableBalance())) {
+        if (amount > taOrgAccount.getAvailableBalance()) {
             responseBean.addError("账户可用余额不足，请稍后再试");
             return responseBean;
         }
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.REFUND));
-        taOrgOrder.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgOrder.setAmount(amount);
+        taOrgOrder.setRealAmount(amount);
         taOrgOrder.setCreateDate(LocalDateTime.now());
         taOrgOrder.setExpiryDate(LocalDateTime.now().plusDays(7));
         taOrgOrder.setRemark("线上退款");
         taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
         taOrgOrderDetail.setOrgId(orgId);
         taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_REFUND);
-        taOrgOrderDetail.setAmount(CommonUtils.yuanToFen(amount));
-        taOrgOrderDetail.setUnitPrice(CommonUtils.yuanToFen(amount));
+        taOrgOrderDetail.setAmount(amount);
+        taOrgOrderDetail.setUnitPrice(amount);
+        taOrgOrderDetail.setRealAmount(amount);
         taOrgOrderDetail.setQuantity(1);
         taOrgOrderDetail.setStatus(CommConstant.STATUS_NORMAL);
         if (taOrgOrderDetailMapper.insert(taOrgOrderDetail) < 1) {
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
         taOrgRefundApplication.setUserName(taUser.getUserName());
-        taOrgRefundApplication.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgRefundApplication.setAmount(amount);
         taOrgRefundApplication.setAuditStatus(CommConstant.CHECK_STATUS_CHECKING);
         taOrgRefundApplication.setOrderId(taOrgOrder.getOrderId());
         taOrgRefundApplication.setStatus(CommConstant.STATUS_NORMAL);
         }
 
         // 5.更新账户新金额
-        taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), CommonUtils.yuanToFen(amount));
+        taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
         responseBean.addSuccess(taOrgOrder);
         return responseBean;
     }
         return sysUser;
     }
 
-    public TaOrgRefundApplication selectRefundApplication(TaOrgRefundApplication refundApplication){
+    public TaOrgRefundApplication selectRefundApplication(TaOrgRefundApplication refundApplication) {
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", refundApplication.getOrderId());
         return taOrgRefundApplicationMapper.selectOne(taOrgRefundApplicationQueryWrapper);
     }
 
+    /**
+     * 计算实付金额
+     *
+     * @param amount
+     * @return
+     */
+    public static Integer calculateRealAmount(Integer amount) {
+        Double dAmount = CommonUtils.fenToYuan(amount);
+        // 防止误差，结果需要加0.01
+        Double dRealAmount = dAmount / (1 - CommConstant.WXMCH_PAY_RATE) + 0.01;
+        return CommonUtils.yuanToFen(dRealAmount);
+    }
 }

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

         }
 
         // 校验活动是否开始
-        if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() > LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()
+        if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()
                 && (taRedPacketHelp.getHelpSuccesPersons() != null || taRedPacketHelp.getLimitNumPerDay() != null
                 || taRedPacketHelp.getLimitNumPerPerson() != null || taRedPacketHelp.getLimitNumForEachPerson() != null)) {
             responseBean.addError("活动已开始，不可修改");
             record.setActivityEndTip(taRedPacketHelp.getActivityEndTip());
             iTaRedPacketService.updateById(record);
         }
-
+        responseBean.addSuccess(taRedPacket);
         return responseBean;
     }
 

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

         taRedPacketMoney.setSendNum((Long) result.get("sendNum"));
         taRedPacketMoney.setSendTotalAmount((Long) result.get("sendTotalAmount"));
 
-        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper =new QueryWrapper<>();
-        orgAccountQueryWrapper.eq("org_id",orgId);
-        orgAccountQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
+        orgAccountQueryWrapper.eq("org_id", orgId);
+        orgAccountQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(orgAccountQueryWrapper);
-        if(taOrgAccount != null){
+        if (taOrgAccount != null) {
             taRedPacketMoney.setAvailableBalance(taOrgAccount.getAvailableBalance());
         }
 
         ResponseBean responseBean = new ResponseBean();
 
         // 更新红包金额设置
+        TaRedPacketMoney money = getById(taRedPacketMoney.getActivityId());
+        if (money.getBudget() != taRedPacketMoney.getBudget()) {
+            money.setBalance(money.getBalance() + (taRedPacketMoney.getBudget() - money.getBudget()));
+        }
+
         updateById(taRedPacketMoney);
         // 更新红包客户端消息配置
         if (!StringUtils.isEmpty(taRedPacketMoney.getActivityName()) || !StringUtils.isEmpty(taRedPacketMoney.getMchName())

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

 	@Autowired
 	private TaPersonMapper taPersonMapper;
 
+	@Autowired
+	private TaH5ImagesMapper taH5ImagesMapper;
+
 	/**
 	 * 校验是否合法第三方接口调用
 	 *
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
 		TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+		// 查询红包配置图片信息
+		QueryWrapper<TaH5Images> h5ImagesQueryWrapper = new QueryWrapper<>();
+		h5ImagesQueryWrapper.eq("activity_id", taDrainage.getActivityId());
+		List<TaH5Images> h5ImagesList = taH5ImagesMapper.selectList(h5ImagesQueryWrapper);
+		h5ImagesList.stream().forEach(r -> {
+			switch (r.getImageType()) {
+				case "RedPacket.rp_share_post_img":
+					taRedPacket.setSharePosterImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_activity_rules_img":
+					taRedPacket.setActivityRulesImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_help_background_img":
+					taRedPacket.setHelpBackgroundImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_index_background_img":
+					taRedPacket.setIndexBackgroundImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_ranking_background_img":
+					taRedPacket.setRankingBackgroundImg(r.getImageUrl());
+					break;
+				default:
+					break;
+			}
+		});
 		//活动信息
 		map.put("taRedPacket",taRedPacket);
 
 	@Override
 	public Map<String, Object> getPersonInfo(String mpAppid, String drainageId, String personId) {
 		Map<String,Object> map = new HashMap<>();
-		//查看这个人是否绑定了小程序用户
+		// 查看这个人是否绑定了小程序用户
 		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", personId));
 
-		//我的小程序信息
+		// 我的小程序信息
 		TaPerson minePerson = taPersonMapper.selectById(personId);
 		map.put("minePerson",minePerson);
 
-		//第一步根据drainggeid查询出红包表对应的记录
+		// 第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
-		//第二步查询出这个H5对应的活动
+		// 第二步查询出这个H5对应的活动
 		TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
-		//活动信息
+
+		// 查询红包配置图片信息
+		QueryWrapper<TaH5Images> h5ImagesQueryWrapper = new QueryWrapper<>();
+		h5ImagesQueryWrapper.eq("activity_id", taDrainage.getActivityId());
+		List<TaH5Images> h5ImagesList = taH5ImagesMapper.selectList(h5ImagesQueryWrapper);
+		h5ImagesList.stream().forEach(r -> {
+			switch (r.getImageType()) {
+				case "RedPacket.rp_share_post_img":
+					taRedPacket.setSharePosterImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_activity_rules_img":
+					taRedPacket.setActivityRulesImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_help_background_img":
+					taRedPacket.setHelpBackgroundImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_index_background_img":
+					taRedPacket.setIndexBackgroundImg(r.getImageUrl());
+					break;
+				case "RedPacket.rp_ranking_background_img":
+					taRedPacket.setRankingBackgroundImg(r.getImageUrl());
+					break;
+				default:
+					break;
+			}
+		});
+
+		// 活动信息
 		map.put("taRedPacket",taRedPacket);
 
-		//是否我的红包助力报名信息
+		// 是否我的红包助力报名信息
 		QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("activity_id",taRedPacket.getActivityId());
 		queryWrapper.eq("org_id",taRedPacket.getOrgId());
 		TaRedPacketPerson mineRedPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
 		map.put("mineRedPacketPerson",mineRedPacketPerson);
 
-		//根据活动id查询这个活动的助力规则
+		// 根据活动id查询这个活动的助力规则
 		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
 		map.put("taRedPacketHelp",taRedPacketHelp);
 
-		//查看我的爆红助力列表
+		// 查看我的爆红助力列表
 		QueryWrapper<TaRedPacketHistory> historyQueryWrapper = new QueryWrapper<>();
 		historyQueryWrapper.eq("activity_id",taRedPacket.getActivityId());
 		historyQueryWrapper.eq("org_id",taRedPacket.getOrgId());

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

         AND t3.target_id = #{targetId}
         and t3.org_id = #{orgId}
     </select>
+
 </mapper>