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

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

@@ -11,4 +11,8 @@ public class NumberUtils {
     public static Integer yuanToFen(String amount){
         return new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
     }
+
+    public static String  fenToYuan(String price) {
+        return BigDecimal.valueOf(Long.valueOf(price)).divide(new BigDecimal(100)).toString();
+    }
 }

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

@@ -1,11 +1,22 @@
 package com.huiju.estateagents.redpack.controller;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.NumberUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.redpack.entity.OrgAccountExport;
+import com.huiju.estateagents.redpack.entity.RechargeOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
@@ -20,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -88,6 +100,50 @@ public class TaOrgAccountController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 账户信息导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgAccount/taOrgAccountListExport")
+    public void taOrgAccountListExport(@RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=账户统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), OrgAccountExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        //使用分页插件
+        QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
+        queryWrapper.orderByDesc("create_date");
+
+        List<OrgAccountExport> data = new ArrayList<>();
+        List<TaOrgAccount> result = iTaOrgAccountService.list(queryWrapper);
+
+        result.forEach(e -> {
+            Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(e.getOrgId());
+            //查询退款冻结额
+            Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(e.getOrgId());
+            OrgAccountExport export = new OrgAccountExport();
+            export.setMiniAppName(e.getMiniappName());
+            export.setTotalRecharge(NumberUtils.fenToYuan(taOrgOrderMapper.countTotalRechargeAmount(e.getOrgId()).toString()));
+            export.setConsumeAmount(NumberUtils.fenToYuan(e.getPurchaseAmount().toString()));
+            export.setRefundAmount(NumberUtils.fenToYuan(e.getTotalRefund().toString()));
+            Integer balance = totalRechargeAmount - e.getPurchaseAmount() - e.getTotalRefund() - totalBlockAmount;
+            export.setBalance(NumberUtils.fenToYuan(totalRechargeAmount.toString()));
+
+            data.add(export);
+        });
+
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
     /**
      * 保存对象
      *

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

@@ -73,12 +73,13 @@ public class TaOrgOrderController extends BaseController {
                                        @RequestParam(value = "miniAppName", required = false) String miniAppName,
                                        @RequestParam(value = "itemType", required = false) String itemType,
                                        @RequestParam(value = "startDate", required = false) String startDate,
-                                       @RequestParam(value = "endDate", required = false) String endDate) {
+                                       @RequestParam(value = "endDate", required = false) String endDate,
+                                       @RequestParam(value = "auditStatus", required = false) String auditStatus) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName);
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName, auditStatus);
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class OrgAccountExport {
+    /**
+     * 账户
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "账户", index = 0)
+    private String miniAppName;
+
+    /**
+     * 总充值金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "总充值金额", index = 1)
+    private String totalRecharge;
+
+    /**
+     * 消费金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费金额", index = 2)
+    private String consumeAmount;
+
+    /**
+     * 已退款金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "已退款金额", index = 3)
+    private String refundAmount;
+
+    /**
+     * 余额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "余额", index = 4)
+    private String balance;
+
+}

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

@@ -43,7 +43,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                   @Param("tradingStatus") String tradingStatus,
                                                   @Param("startDate") String startDate,
                                                   @Param("endDate") String endDate,
-                                                  @Param("miniAppName") String miniAppName);
+                                                  @Param("miniAppName") String miniAppName,
+                                                  @Param("auditStatus") String auditStatus);
 
     /**
      * 消费订单

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

@@ -51,7 +51,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param orderType
      * @return
      */
-    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName);
+    IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName, String auditStatus);
 
     /**
      * 充值订单列表导出

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

@@ -102,12 +102,12 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     private ITaOrgAccountService taOrgAccountService;
 
     @Override
-    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName) {
+    public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName, String auditStatus) {
         IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             List<String> urlList = new ArrayList<>();
-            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
+            result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus);
             result.getRecords().forEach(e -> {
                 e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             });
@@ -532,7 +532,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         //插入凭证记录
         if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())) {
-            List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(refundApplication.getOrgId(), taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
+            List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(refundApplication, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
             taOrgAccountCertificateList.forEach(e -> {
                 taOrgAccountCertificateMapper.insert(e);
             });
@@ -675,13 +675,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @param userId
      * @return
      */
-    public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
+    public List<TaOrgAccountCertificate> assembleAccountCertificate(TaOrgRefundApplication taOrgRefundApplication, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
         SysUser taUser = selectUserById(userId);
         List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
 
-        taOrgAccount.getCertificateList().forEach(e -> {
+        taOrgRefundApplication.getCertificateList().forEach(e -> {
             TaOrgAccountCertificate taOrgAccountCertificate = new TaOrgAccountCertificate();
-            taOrgAccountCertificate.setOrgId(orgId);
+            taOrgAccountCertificate.setOrgId(taOrgRefundApplication.getOrgId());
             taOrgAccountCertificate.setAccountId(taOrgAccount.getAccountId());
             taOrgAccountCertificate.setAccountSerialNo(accountSerialNo);
             taOrgAccountCertificate.setOrderId(orderId);

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

@@ -54,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 appellation) {
+                                               String contactName, String telephone, String phone, String job, String appellation, String contentType) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -65,7 +65,7 @@ public class TaContactController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
             queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
             queryWrapper.like(!StringUtils.isEmpty(appellation), "appellation", appellation);
-            queryWrapper.eq("contact_type", CommConstant.FINANCE);
+            queryWrapper.like(!StringUtils.isEmpty(contentType), "contact_type", contentType);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 

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

@@ -41,6 +41,9 @@
         <if test="tradingStatus != null and tradingStatus != ''">
             and t.trading_status = #{tradingStatus}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            and d.audit_status = #{auditStatus}
+        </if>
         <if test="startDate != null and startDate != ''">
             and t.create_date > #{startDate}
         </if>