新需求

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

@@ -832,4 +832,29 @@ public class CommConstant {
      * 审核通过
      */
     public static final Integer STATUS_VERIFY_PASS = 4;
+
+    /**
+     * 充值操作
+     */
+    public static final String RECHARGE = "CZ";
+
+    /**
+     * 退款操作
+     */
+    public static final String REFUND = "TK";
+
+    /**
+     * 明细类型--充值
+     */
+    public static final String ITEM_TYPE_RECHARGE = "recharge";
+
+    /**
+     * 明细类型--退费
+     */
+    public static final String ITEM_TYPE_REFUND = "refund";
+
+    /**
+     * 明细类型--红包
+     */
+    public static final String ITEM_TYPE_REDPACKAGE = "redPackage";
 }

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

@@ -1,5 +1,8 @@
 package com.huiju.estateagents.common;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -19,4 +22,10 @@ public class CommonUtils {
             return true;
         }
     }
+
+    public static String generateTradeNo(String tradeType){
+        String sdf = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+        int randNum = (int) (new Random().nextDouble() * (9999 - 1000 + 1)) + 1000;// 获取5位随机数
+        return tradeType+sdf+randNum;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.redpack.controller;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,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.TaOrgAccount;
 import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
 
@@ -28,7 +31,7 @@ import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/channel")
 public class TaOrgAccountController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOrgAccountController.class);
@@ -43,14 +46,16 @@ public class TaOrgAccountController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOrgAccount",method= RequestMethod.GET)
+    @RequestMapping(value="/api/taOrgAccount",method= RequestMethod.GET)
     public ResponseBean taOrgAccountList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="miniAppName", required = false) String miniAppName){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaOrgAccount> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOrgAccount> result = iTaOrgAccountService.page(pg, queryWrapper);
@@ -68,7 +73,7 @@ public class TaOrgAccountController extends BaseController {
      * @param taOrgAccount 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrgAccount",method= RequestMethod.POST)
+    @RequestMapping(value="/api/taOrgAccount",method= RequestMethod.POST)
     public ResponseBean taOrgAccountAdd(@RequestBody TaOrgAccount taOrgAccount){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -90,7 +95,7 @@ public class TaOrgAccountController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taOrgAccount/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/api/taOrgAccount/{id}", method= RequestMethod.DELETE)
     public ResponseBean taOrgAccountDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -113,7 +118,7 @@ public class TaOrgAccountController extends BaseController {
      * @param taOrgAccount 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrgAccount/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/api/taOrgAccount/{id}",method= RequestMethod.PUT)
     public ResponseBean taOrgAccountUpdate(@PathVariable Integer id,
                                         @RequestBody TaOrgAccount taOrgAccount){
         ResponseBean responseBean = new ResponseBean();
@@ -135,7 +140,7 @@ public class TaOrgAccountController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taOrgAccount/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/api/taOrgAccount/{id}",method= RequestMethod.GET)
     public ResponseBean taOrgAccountGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -147,4 +152,24 @@ public class TaOrgAccountController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 系统账户充值
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrgAccount/recharge/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgAccountDetailedListGet(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
+                                                    HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            Integer userId = getUserId(request);
+            iTaOrgAccountService.rechargeAccount(id, taOrgAccount, 26, 2149);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDetailedListDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -2,8 +2,10 @@ package com.huiju.estateagents.redpack.entity;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import lombok.Data;
@@ -77,4 +79,15 @@ public class TaOrgAccount implements Serializable {
     private String miniappName;
 
 
+    /**
+     * 充值凭证
+     */
+    @TableField(exist = false)
+    private List<String> certificateList;
+
+    /**
+     * 充值金额
+     */
+    @TableField(exist = false)
+    private Integer rechargeAmount;
 }

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

@@ -57,7 +57,7 @@ public class TaOrgAccountCertificate implements Serializable {
     /**
      * 凭证说明
      */
-    private String desc;
+    private String remark;
 
     /**
      * 凭证地址

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

@@ -57,7 +57,7 @@ public class TaOrgAccountDetailedList implements Serializable {
     /**
      * 说明
      */
-    private String desc;
+    private String remark;
 
     /**
      * 消费时间

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 
 /**
@@ -12,5 +13,12 @@ import com.huiju.estateagents.redpack.entity.TaOrgAccount;
  * @since 2020-06-03
  */
 public interface ITaOrgAccountService extends IService<TaOrgAccount> {
-
+    /**
+     * 账户充值接口
+     * @param accountId
+     * @param taOrgAccount
+     * @param orgId
+     * @return
+     */
+    ResponseBean rechargeAccount(String accountId, TaOrgAccount taOrgAccount, Integer orgId, Integer userId);
 }

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

@@ -1,12 +1,36 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+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.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountCertificateMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
 import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
 
+import io.swagger.models.auth.In;
+
 /**
  * <p>
  * 系统账户表  服务实现类
@@ -18,4 +42,180 @@ import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
 @Service
 public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaOrgAccount> implements ITaOrgAccountService {
 
+    @Autowired
+    private TaOrgAccountMapper taOrgAccountMapper;
+
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    private TaOrgOrderDetailMapper taOrgOrderDetailMapper;
+
+    @Autowired
+    private TaOrgAccountCertificateMapper taOrgAccountCertificateMapper;
+
+    @Autowired
+    private TaOrgAccountDetailedListMapper taOrgAccountDetailedListMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Override
+    @Transactional(rollbackFor = {RuntimeException.class})
+    public ResponseBean rechargeAccount(String accountId, TaOrgAccount taOrgAccount, Integer orgId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //更新系统账户充值金额
+        TaOrgAccount rechargeAccount = assembleRechargeAccount(accountId, taOrgAccount);
+        int rechargeAccountInsertResult = taOrgAccountMapper.updateById(rechargeAccount);
+
+        //新增订单记录
+        TaOrgOrder taOrgOrder = assembleTaOrgOrder(orgId, taOrgAccount.getRechargeAmount(), userId);
+        int taOrgOrderInsertResult = taOrgOrderMapper.insert(taOrgOrder);
+
+        //新增关联订单明细
+        TaOrgOrderDetail taOrgOrderDetail = assembleTaOrgOrderDetail(taOrgOrder.getOrderId(), orgId, taOrgAccount.getRechargeAmount());
+        int taOrgOrderDetailInsertResult = taOrgOrderDetailMapper.insert(taOrgOrderDetail);
+
+        //新增账户消费流水记录
+        TaOrgAccountDetailedList taOrgAccountDetailedList = assembleAccountDetailList(orgId, taOrgAccount, taOrgOrder.getOrderId(), userId);
+        int taOrgAccountDetailedListInsertResult = taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
+
+        //插入凭证记录
+        if (CollectionUtils.isNotEmpty(taOrgAccount.getCertificateList())){
+            List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(orgId, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId);
+            taOrgAccountCertificateList.forEach(e -> {
+                taOrgAccountCertificateMapper.insert(e);
+            });
+        }
+
+        if (rechargeAccountInsertResult < 1 ||
+                taOrgOrderInsertResult < 1 ||
+                taOrgOrderDetailInsertResult < 1 ||
+                taOrgAccountDetailedListInsertResult < 1){
+            responseBean.addError("充值失败");
+            return responseBean;
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 构造充值账户
+     * @param accountId
+     * @param taOrgAccount
+     * @return
+     */
+    private TaOrgAccount assembleRechargeAccount(String accountId, TaOrgAccount taOrgAccount){
+        QueryWrapper<TaOrgAccount> selectOneQuery = new QueryWrapper<>();
+        selectOneQuery.eq("account_id", accountId);
+        TaOrgAccount selectOneAccount = taOrgAccountMapper.selectOne(selectOneQuery);
+
+        TaOrgAccount rechargeAccount = new TaOrgAccount();
+        rechargeAccount.setAccountId(accountId);
+        if (selectOneAccount.getAvailableBalance() == 0){
+            rechargeAccount.setAvailableBalance(taOrgAccount.getRechargeAmount());
+        }else{
+            rechargeAccount.setAvailableBalance(selectOneAccount.getAvailableBalance() + taOrgAccount.getRechargeAmount());
+        }
+
+        if (selectOneAccount.getRealBalance() == 0){
+            rechargeAccount.setRealBalance(taOrgAccount.getRechargeAmount());
+        }else{
+            rechargeAccount.setRealBalance(selectOneAccount.getRealBalance() + taOrgAccount.getRechargeAmount());
+        }
+        rechargeAccount.setModifyDate(LocalDateTime.now());
+
+        return rechargeAccount;
+    }
+
+    public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId){
+        TaUser taUser = selectUserById(userId);
+        List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
+
+        taOrgAccount.getCertificateList().forEach(e -> {
+            TaOrgAccountCertificate taOrgAccountCertificate = new TaOrgAccountCertificate();
+            taOrgAccountCertificate.setOrgId(orgId);
+            taOrgAccountCertificate.setAccountId(taOrgAccount.getAccountId());
+            taOrgAccountCertificate.setAccountSerialNo(accountSerialNo);
+            taOrgAccountCertificate.setOrderId(orderId);
+            taOrgAccountCertificate.setConsumptionType(CommConstant.ITEM_TYPE_RECHARGE);
+            taOrgAccountCertificate.setRemark("线下充值缴费");
+            taOrgAccountCertificate.setUrl(e);
+            taOrgAccountCertificate.setCreateDate(LocalDateTime.now());
+            taOrgAccountCertificate.setUserId(userId);
+            taOrgAccountCertificate.setUserName(taUser.getUserName());
+            taOrgAccountCertificateList.add(taOrgAccountCertificate);
+        });
+
+        return taOrgAccountCertificateList;
+    }
+    /**
+     * 构造订单
+     * @param orgId
+     * @param amount
+     * @param userId
+     * @return
+     */
+    private TaOrgOrder assembleTaOrgOrder(Integer orgId, Integer amount, Integer userId){
+
+        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());
+
+        return taOrgOrder;
+    }
+
+    private TaOrgOrderDetail assembleTaOrgOrderDetail(String orderId, Integer orgId, Integer amount){
+        TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
+
+        taOrgOrderDetail.setOrderId(orderId);
+        taOrgOrderDetail.setOrgId(orgId);
+        taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_RECHARGE);
+        taOrgOrderDetail.setAmount(amount);
+
+        return taOrgOrderDetail;
+    }
+
+    /**
+     * 构造消费流水记录
+     * @param orgId
+     * @param taOrgAccount
+     * @param orderId
+     * @param userId
+     * @return
+     */
+    private TaOrgAccountDetailedList assembleAccountDetailList(Integer orgId, TaOrgAccount taOrgAccount, String orderId, Integer userId){
+
+        TaUser taUser = selectUserById(userId);
+        TaOrgAccountDetailedList taOrgAccountDetailed = new TaOrgAccountDetailedList();
+        taOrgAccountDetailed.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountDetailed.setOrgId(orgId);
+        taOrgAccountDetailed.setAmount(taOrgAccount.getRechargeAmount());
+        //1收入,-1支出
+        taOrgAccountDetailed.setSignType(CommConstant.STATUS_NORMAL);
+        taOrgAccountDetailed.setRemark("线下充值缴费");
+        taOrgAccountDetailed.setOrderId(orderId);
+        taOrgAccountDetailed.setUserId(userId);
+        taOrgAccountDetailed.setUserName(taUser.getUserName());
+
+        return taOrgAccountDetailed;
+    }
+
+    public TaUser selectUserById(Integer userId){
+        //获取操作人
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("user_id", userId);
+        TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
+        return taUser;
+    }
 }