新需求

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

@@ -879,4 +879,8 @@ public class CommConstant {
      */
     public static final String TRADING_STATUS_PROCESSING = "processing";
 
+    /**
+     * 人员类型---财务
+     */
+    public static final String FINANCE = "finance";
 }

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

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.redpack.entity.TaH5Template;
 import com.huiju.estateagents.redpack.service.ITaH5TemplateService;
 
@@ -28,7 +29,7 @@ import com.huiju.estateagents.redpack.service.ITaH5TemplateService;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaH5TemplateController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaH5TemplateController.class);
@@ -43,14 +44,18 @@ public class TaH5TemplateController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taH5Template",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taH5Template",method= RequestMethod.GET)
     public ResponseBean taH5TemplateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+									    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value ="h5TemplateId", required = false) String h5TemplateId,
+                                        @RequestParam(value ="name", required = false) String name){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    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.orderByDesc("create_date");
 
             IPage<TaH5Template> result = iTaH5TemplateService.page(pg, queryWrapper);

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

@@ -149,7 +149,7 @@ public class TaOrgAccountController extends BaseController {
     public ResponseBean taOrgAccountGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaOrgAccountService.getById(id));
+            responseBean.addSuccess(iTaOrgAccountService.getOrgAccountById(id));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taOrgAccountDelete -=- {}",e.toString());

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

@@ -96,4 +96,10 @@ public class TaOrgAccount implements Serializable {
      */
     @TableField(exist = false)
     private Integer refundAmount;
+
+    /**
+     * 代理商名称
+     */
+    private String channelProxyName;
+
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
@@ -15,5 +16,10 @@ import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
  */
 @Mapper
 public interface TaOrgAccountBlockedMapper extends BaseMapper<TaOrgAccountBlocked> {
-
+    /**
+     * 总冻结金额
+     * @param orgId
+     * @return
+     */
+    Integer countTotalBlockAmount(@Param("orgId") Integer orgId);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.redpack.entity.TaOrgAccount;
@@ -15,5 +16,5 @@ import com.huiju.estateagents.redpack.entity.TaOrgAccount;
  */
 @Mapper
 public interface TaOrgAccountMapper extends BaseMapper<TaOrgAccount> {
-
+    TaOrgAccount getOrgAccountById(@Param("orgId") Integer orgId);
 }

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

@@ -51,4 +51,11 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                          @Param("itemType") String itemType,
                                          @Param("startDate") LocalDate startDate,
                                          @Param("endDate") LocalDate endDate);
+
+    /**
+     * 总充值金额
+     * @param orgId
+     * @return
+     */
+    Integer countTotalRechargeAmount(@Param("orgId") Integer orgId);
 }

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

@@ -31,4 +31,11 @@ public interface ITaOrgAccountService extends IService<TaOrgAccount> {
      * @return
      */
     ResponseBean refundAccount(String accountId, TaOrgAccount taOrgAccount, Integer orgId, Integer userId);
+
+    /**
+     * 账户详情接口
+     * @param orgId
+     * @return
+     */
+    ResponseBean getOrgAccountById(Integer orgId);
 }

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

@@ -18,6 +18,10 @@ 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.SMSUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
 import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
 import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
@@ -33,6 +37,8 @@ import com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper;
 import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.redpack.mapper.TaOrgRefundApplicationMapper;
 import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.sample.mapper.TaContactMapper;
 
 import io.swagger.models.auth.In;
 
@@ -71,6 +77,15 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaContactMapper taContactMapper;
+
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
+    @Autowired
+    SMSUtils smsUtils;
+
     @Override
     @Transactional(rollbackFor = {RuntimeException.class})
     public ResponseBean rechargeAccount(String accountId, TaOrgAccount taOrgAccount, Integer orgId, Integer userId) {
@@ -109,6 +124,11 @@ 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);
+
         return responseBean;
     }
 
@@ -154,6 +174,30 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
             return responseBean;
         }
 
+        TaContact taContact = selectSmsContactUser();
+        String[] smsParams = {"业务平台退款申请", taOrgOrder.getTradeNo() + taOrgAccount.getMiniappName()};
+        // 短信发送
+        sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_REFUND, smsParams);
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getOrgAccountById(Integer orgId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.getOrgAccountById(orgId);
+
+        //查询总充值金额
+        Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(orgId);
+
+        //查询退款冻结额
+        Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(orgId);
+
+        //账户余额=总充值金额-已消费金额-已退款额-退款冻结额
+        Integer balance = totalRechargeAmount - taOrgAccount.getPurchaseAmount() - taOrgAccount.getTotalRefund() - totalBlockAmount;
+        taOrgAccount.setRealBalance(balance);
+
+        responseBean.addSuccess(taOrgAccount);
         return responseBean;
     }
 
@@ -307,4 +351,37 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
         return taUser;
     }
+
+    private String sendSmsMessage(String tel, String type, String[] params) {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            return "短信发送失败: 没有手机号或者短信模板";
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+
+            // TODO 写消息发送日志
+
+            return "没有设置有效的【" + type + "】短信模板";
+        }
+
+        boolean success = smsUtils.sendMessage(smsSetting.getTplCode(), tel, params);
+
+        // TODO 写消息发送日志
+
+        return success ? null : "短信发送失败";
+    }
+
+    public TaContact selectSmsContactUser(){
+        //获取操作人
+        QueryWrapper<TaContact> taContactQueryWrapper = new QueryWrapper<>();
+        taContactQueryWrapper.eq("contact_Type", CommConstant.FINANCE);
+        TaContact taContact = taContactMapper.selectOne(taContactQueryWrapper);
+        return taContact;
+    }
 }

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

@@ -298,7 +298,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgRefundApplication.setAuditorId(userId);
         taOrgRefundApplication.setAuditorName(taUser.getUserName());
         taOrgRefundApplication.setAuditResult(CommConstant.ITEM_TYPE_REFUND.equals(operateType) ? "退款成功" : refundApplication.getAuditResult());
-        taOrgRefundApplication.setAuditStatus(CommConstant.ITEM_TYPE_REFUND.equals(operateType) ? "同意" : "不同意");
+        taOrgRefundApplication.setAuditStatus(CommConstant.ITEM_TYPE_REFUND.equals(operateType) ? "agree" : "unAgree");
 
         return taOrgRefundApplication;
     }

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper">
 
+    <select id="countTotalBlockAmount" resultType="java.lang.Integer">
+        select sum(t.blocked_balance) from ta_org_account_blocked t
+        where t.org_id = #{orgId}
+    </select>
+
 </mapper>

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

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper">
 
+    <select id="getOrgAccountById" resultType="com.huiju.estateagents.redpack.entity.TaOrgAccount">
+        select
+        t.miniapp_name,
+        c.channel_proxy_name,
+        t.purchase_amount,
+        total_refund
+        From ta_org_account  t
+        left join ta_channel_app_relation b on t.org_id = b.org_id
+        left join ta_channel_proxy c on b.channel_id = c.channel_id
+        where t.org_id = #{orgId}
+    </select>
+
 </mapper>

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

@@ -86,5 +86,11 @@
         GROUP BY t.order_id
     </select>
 
+    <select id="countTotalRechargeAmount" resultType="java.lang.Integer">
+        select sum(t.amount) as amount from ta_org_order t
+        left join ta_org_order_detail a on t.order_id = a.order_id where t.org_id = #{orgId}
+        and a.item_type = 'recharge'
+    </select>
+
 
 </mapper>