diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
index a7bcba19..f1bcf7eb 100644
--- a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
@@ -18,25 +18,28 @@ import cc.hiver.core.config.properties.HiverTokenProperties;
import cc.hiver.core.entity.Role;
import cc.hiver.core.entity.User;
import cc.hiver.core.entity.UserRole;
+import cc.hiver.core.entity.Worker;
import cc.hiver.core.service.RoleService;
import cc.hiver.core.service.UserRoleService;
import cc.hiver.core.service.UserService;
-import cc.hiver.mall.debt.service.DebtService;
+import cc.hiver.core.service.WorkerService;
import cc.hiver.mall.entity.Shop;
import cc.hiver.mall.entity.ShopTakeaway;
import cc.hiver.mall.entity.ShopUser;
+import cc.hiver.mall.entity.WorkerRelaPrice;
import cc.hiver.mall.invitelog.constant.InviteLogConstant;
import cc.hiver.mall.invitelog.entity.InviteLog;
import cc.hiver.mall.invitelog.service.InviteLogService;
+import cc.hiver.mall.pojo.vo.WorkerRedisVo;
import cc.hiver.mall.service.ShopService;
import cc.hiver.mall.service.ShopTakeawayService;
import cc.hiver.mall.service.ShopUserService;
-import cc.hiver.mall.service.SupplierService;
-import cc.hiver.mall.service.mybatis.CustomerService;
-import cc.hiver.mall.service.mybatis.DealingsRecordService;
import cc.hiver.mall.service.mybatis.ProductCategoryService;
+import cc.hiver.mall.service.mybatis.WorkerRelaPriceService;
+import cc.hiver.mall.utils.WorkerRedisCacheUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -52,10 +55,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -109,24 +109,21 @@ public class AuthController {
private ShopUserService shopUserService;
@Autowired
- private ProductCategoryService productCategoryService;
- @PersistenceContext
- private EntityManager entityManager;
-
- @Autowired
- private InviteLogService inviteLogService;
+ private WorkerService workerService;
@Autowired
- private SupplierService supplierService;
+ private WorkerRelaPriceService workerRelaPriceService;
@Autowired
- private CustomerService customerService;
+ private ProductCategoryService productCategoryService;
+ @PersistenceContext
+ private EntityManager entityManager;
@Autowired
- private DebtService debtService;
+ private InviteLogService inviteLogService;
@Autowired
- private DealingsRecordService dealingsRecordService;
+ WorkerRedisCacheUtil workerRedisCacheUtil;
@RequestMapping(value = "/login", method = RequestMethod.POST)
@SystemLog(description = "账号登录", type = LogType.LOGIN)
@@ -177,31 +174,73 @@ public class AuthController {
// 返回当前登录人的信息
result.put("user", user);
- // 店铺登录的话，根据登录人查询所有关联的店铺（店铺启用，并且在有效期内）
- if (UserConstant.USER_TYPE_NORMAL.equals(type)) {
- // 获取
- final List
shopUsers = shopUserService.selectByUserId(user.getId());
- if (shopUsers != null && !shopUsers.isEmpty()) {
- // 获取店主手机号
- for (ShopUser shopUser : shopUsers) {
- final Shop shop = shopService.findById(shopUser.getShop().getId());
- if (shop != null && shop.getShopOwnerId() != null && StringUtils.isNotEmpty(shop.getShopOwnerId())) {
- shop.setClientId(clientId);
- shopService.update(shop);
- shopService.refreshShopCache(shop.getId(), shop.getRegionId());
- final User shopOwner = userService.findById(shop.getShopOwnerId());
- if(shopOwner != null){
- shopUser.setShopOwnerName(shopOwner.getNickname());
- shopUser.setShopOwnerPhone(shopOwner.getMobile());
+ List shop = shopService.getShopByUserid(user.getId());
+ if(!shop.isEmpty()){
+ List shopIds = new ArrayList<>();
+ for (Shop item : shop) {
+ shopIds.add(item.getId());
+ if (StringUtils.isNotEmpty(clientId)) {
+ item.setClientId(clientId);
+ shopService.update(item);
+ shopService.refreshShopCache(item.getId(), item.getRegionId());
+ }
+ }
+ if(!shopIds.isEmpty()){
+ List shopTakeaway = shopTakeawayService.selectListByshopId(shopIds);
+ if(shopTakeaway != null){
+ shop.forEach(e -> {
+ for(ShopTakeaway shopTakeawa : shopTakeaway) {
+ if (e.getId().equals(shopTakeawa.getShopId())) {
+ e.setShopTakeaway(shopTakeawa);
+ }
}
-
+ });
+ }
+ }
+ result.put("shop", shop);
+ }
+ Worker worker = workerService.findByUserId(user.getId());
+ //更新配送员 推送id
+ if(worker!= null){
+ worker.setClientId(clientId);
+ workerService.update(worker);
+ String oldRegion = worker.getRegion();
+ WorkerRedisVo workerRedisVo = StrUtil.isNotBlank(oldRegion) ? workerRedisCacheUtil.get(oldRegion, worker.getWorkerId()) : null;
+ if(workerRedisVo != null){
+ workerRedisVo.setWorker(worker);
+ if (Objects.equals(oldRegion, worker.getRegion())) {
+ workerRedisCacheUtil.update(worker.getRegion(), workerRedisVo);
+ } else {
+ workerRedisCacheUtil.remove(oldRegion, worker.getWorkerId());
+ if (StrUtil.isNotBlank(worker.getRegion())) {
+ workerRedisCacheUtil.put(worker.getRegion(), workerRedisVo);
}
}
- result.put("shopList", shopUsers);
- } else {
- return ResultUtil.error("店铺未开通！");
}
}
+ if(worker!= null && worker.getGetPushOrder() != null && worker.getGetPushOrder() == 1){
+ final List workerRelaPriceList = workerRelaPriceService.selectByWorkerId(worker.getWorkerId());
+ List workerRelaPriceListWaimai = new ArrayList<>();
+ List workerRelaPriceListKuaidi = new ArrayList<>();
+ if(workerRelaPriceList != null && workerRelaPriceList.size() > 0){
+ workerRelaPriceList.forEach(workerRelaPrice -> {
+ if(workerRelaPrice.getGetPushOrder() == 1){
+ if(workerRelaPrice.getOrderType() == 0 ){
+ workerRelaPriceListWaimai.add(workerRelaPrice);
+ }else{
+ workerRelaPriceListKuaidi.add(workerRelaPrice);
+ }
+ }
+ });
+ }
+ if(workerRelaPriceListWaimai.size() > 0){
+ result.put("waimaiData", workerRelaPriceListWaimai);
+ }
+ if(workerRelaPriceListKuaidi.size() > 0){
+ result.put("kuaidiData", workerRelaPriceListKuaidi);
+ }
+ }
+ result.put("worker", worker);
return ResultUtil.data(result);
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/entity/BillingUsageRecord.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/entity/BillingUsageRecord.java
new file mode 100644
index 00000000..c576a3d1
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/entity/BillingUsageRecord.java
@@ -0,0 +1,32 @@
+package cc.hiver.mall.billing.entity;
+
+import cc.hiver.core.common.utils.SnowFlakeUtil;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+@Data
+@TableName("billing_usage_record")
+public class BillingUsageRecord {
+
+ @TableId
+ private String id = SnowFlakeUtil.nextId().toString();
+
+ private String recordType;
+ private String regionId;
+ private LocalDate billingDate;
+ private Date occurTime;
+ private String provider;
+ private String usageType;
+ private String bizType;
+ private String bizId;
+ private String userId;
+ private String receiveMobile;
+ private String resultStatus;
+ private String requestId;
+ private String detail;
+ private Date createTime;
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mapper/BillingUsageRecordMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mapper/BillingUsageRecordMapper.java
new file mode 100644
index 00000000..af18950a
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mapper/BillingUsageRecordMapper.java
@@ -0,0 +1,9 @@
+package cc.hiver.mall.billing.mapper;
+
+import cc.hiver.mall.billing.entity.BillingUsageRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BillingUsageRecordMapper extends BaseMapper {
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordConsumer.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordConsumer.java
new file mode 100644
index 00000000..21b56f86
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordConsumer.java
@@ -0,0 +1,50 @@
+package cc.hiver.mall.billing.mq;
+
+import cc.hiver.mall.billing.entity.BillingUsageRecord;
+import cc.hiver.mall.billing.mapper.BillingUsageRecordMapper;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.ZoneId;
+import java.util.Date;
+
+@Slf4j
+@Component
+public class BillingRecordConsumer {
+
+ @Autowired
+ private BillingUsageRecordMapper billingUsageRecordMapper;
+
+ @RabbitListener(queues = BillingRecordMqConfig.BILLING_RECORD_QUEUE)
+ public void handleBillingRecord(String messageBody) {
+ try {
+ BillingRecordEvent event = JSON.parseObject(messageBody, BillingRecordEvent.class);
+ if (event == null || event.getRecordType() == null) {
+ log.warn("计费记录MQ消息为空或缺少类型，body={}", messageBody);
+ return;
+ }
+ Date occurTime = event.getOccurTime() == null ? new Date() : event.getOccurTime();
+ BillingUsageRecord record = new BillingUsageRecord();
+ record.setRecordType(event.getRecordType());
+ record.setRegionId(event.getRegionId());
+ record.setBillingDate(occurTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ record.setOccurTime(occurTime);
+ record.setProvider(event.getProvider());
+ record.setUsageType(event.getUsageType());
+ record.setBizType(event.getBizType());
+ record.setBizId(event.getBizId());
+ record.setUserId(event.getUserId());
+ record.setReceiveMobile(event.getReceiveMobile());
+ record.setResultStatus(event.getResultStatus());
+ record.setRequestId(event.getRequestId());
+ record.setDetail(event.getDetail());
+ record.setCreateTime(new Date());
+ billingUsageRecordMapper.insert(record);
+ } catch (Exception e) {
+ log.error("计费记录MQ处理失败，body={}", messageBody, e);
+ }
+ }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordEvent.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordEvent.java
new file mode 100644
index 00000000..c6704885
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordEvent.java
@@ -0,0 +1,26 @@
+package cc.hiver.mall.billing.mq;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BillingRecordEvent {
+
+ public static final String TYPE_SMS = "sms";
+ public static final String TYPE_CONTENT_AUDIT = "content_audit";
+ public static final String TYPE_REAL_NAME_AUTH = "real_name_auth";
+
+ private String recordType;
+ private String regionId;
+ private Date occurTime;
+ private String provider;
+ private String usageType;
+ private String bizType;
+ private String bizId;
+ private String userId;
+ private String receiveMobile;
+ private String resultStatus;
+ private String requestId;
+ private String detail;
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordMqConfig.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordMqConfig.java
new file mode 100644
index 00000000..8b058b36
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordMqConfig.java
@@ -0,0 +1,31 @@
+package cc.hiver.mall.billing.mq;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class BillingRecordMqConfig {
+
+ public static final String BILLING_RECORD_EXCHANGE = "billing.record.direct.exchange";
+ public static final String BILLING_RECORD_QUEUE = "billing.record.queue";
+ public static final String BILLING_RECORD_ROUTING = "billing.record.routing";
+
+ @Bean
+ public DirectExchange billingRecordExchange() {
+ return new DirectExchange(BILLING_RECORD_EXCHANGE, true, false);
+ }
+
+ @Bean
+ public Queue billingRecordQueue() {
+ return new Queue(BILLING_RECORD_QUEUE, true);
+ }
+
+ @Bean
+ public Binding bindingBillingRecordQueue() {
+ return BindingBuilder.bind(billingRecordQueue()).to(billingRecordExchange()).with(BILLING_RECORD_ROUTING);
+ }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordProducer.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordProducer.java
new file mode 100644
index 00000000..5050588d
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/billing/mq/BillingRecordProducer.java
@@ -0,0 +1,79 @@
+package cc.hiver.mall.billing.mq;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Slf4j
+@Component
+public class BillingRecordProducer {
+
+ private static final int DETAIL_MAX_LENGTH = 500;
+
+ @Autowired
+ private RabbitTemplate rabbitTemplate;
+
+ public void recordSms(String regionId, String smsType, String receiveMobile, String bizType, String bizId) {
+ BillingRecordEvent event = baseEvent(BillingRecordEvent.TYPE_SMS, regionId, "sms", smsType, bizType, bizId, null);
+ event.setReceiveMobile(receiveMobile);
+ event.setResultStatus("sent");
+ send(event);
+ }
+
+ public void recordContentAudit(String regionId, String auditType, String bizType, String bizId,
+ String userId, String resultStatus, String requestId, String detail) {
+ BillingRecordEvent event = baseEvent(BillingRecordEvent.TYPE_CONTENT_AUDIT, regionId, "aliyun", auditType, bizType, bizId, userId);
+ event.setResultStatus(resultStatus);
+ event.setRequestId(requestId);
+ event.setDetail(limit(detail));
+ send(event);
+ }
+
+ public void recordRealNameAuth(String regionId, String userId, String resultStatus, String requestId, String detail) {
+ BillingRecordEvent event = baseEvent(BillingRecordEvent.TYPE_REAL_NAME_AUTH, regionId,
+ "aliyun_three_element", "three_element", "ie_real_name_auth", null, userId);
+ event.setResultStatus(resultStatus);
+ event.setRequestId(requestId);
+ event.setDetail(limit(detail));
+ send(event);
+ }
+
+ private BillingRecordEvent baseEvent(String recordType, String regionId, String provider,
+ String usageType, String bizType, String bizId, String userId) {
+ BillingRecordEvent event = new BillingRecordEvent();
+ event.setRecordType(recordType);
+ event.setRegionId(regionId);
+ event.setOccurTime(new Date());
+ event.setProvider(provider);
+ event.setUsageType(usageType);
+ event.setBizType(bizType);
+ event.setBizId(bizId);
+ event.setUserId(userId);
+ return event;
+ }
+
+ private void send(BillingRecordEvent event) {
+ if (event == null) {
+ return;
+ }
+ try {
+ rabbitTemplate.convertAndSend(BillingRecordMqConfig.BILLING_RECORD_EXCHANGE,
+ BillingRecordMqConfig.BILLING_RECORD_ROUTING, JSON.toJSONString(event));
+ } catch (Exception e) {
+ log.warn("计费记录MQ发送失败，不影响主流程 recordType={}, regionId={}, usageType={}",
+ event.getRecordType(), event.getRegionId(), event.getUsageType(), e);
+ }
+ }
+
+ private String limit(String value) {
+ if (CharSequenceUtil.isBlank(value) || value.length() <= DETAIL_MAX_LENGTH) {
+ return value;
+ }
+ return value.substring(0, DETAIL_MAX_LENGTH);
+ }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminBillingUsageController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminBillingUsageController.java
new file mode 100644
index 00000000..fbcf9fe3
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminBillingUsageController.java
@@ -0,0 +1,150 @@
+package cc.hiver.mall.controller;
+
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.billing.entity.BillingUsageRecord;
+import cc.hiver.mall.billing.mapper.BillingUsageRecordMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Api(tags = "后台管理系统第三方计费用量接口")
+@RequestMapping("/hiver/mall/admin/billingUsage")
+public class AdminBillingUsageController {
+
+ @Autowired
+ private BillingUsageRecordMapper billingUsageRecordMapper;
+
+ @Data
+ public static class BillingUsageQuery {
+ @ApiModelProperty(value = "校区/学校ID")
+ private String regionId;
+ @ApiModelProperty(value = "记录类型：sms/content_audit/real_name_auth")
+ private String recordType;
+ @ApiModelProperty(value = "调用类型：短信模板、text/image/video_submit等")
+ private String usageType;
+ @ApiModelProperty(value = "开始日期，格式yyyy-MM-dd")
+ private String startDate;
+ @ApiModelProperty(value = "结束日期，格式yyyy-MM-dd")
+ private String endDate;
+ @ApiModelProperty(value = "页码")
+ private int pageNumber = 1;
+ @ApiModelProperty(value = "每页条数")
+ private int pageSize = 10;
+ }
+
+ @Data
+ public static class BillingUsageSummaryVo {
+ @ApiModelProperty(value = "校区/学校ID")
+ private String regionId;
+ @ApiModelProperty(value = "计费日期")
+ private LocalDate billingDate;
+ @ApiModelProperty(value = "记录类型")
+ private String recordType;
+ @ApiModelProperty(value = "调用类型")
+ private String usageType;
+ @ApiModelProperty(value = "用量次数")
+ private Long usageCount;
+ }
+
+ @PostMapping("/summaryList")
+ @ApiOperation(value = "按校区/日期/类型查询第三方计费用量汇总")
+ public Result> summaryList(@RequestBody BillingUsageQuery query) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.select("region_id", "billing_date", "record_type", "usage_type", "count(1) as usage_count");
+ applyMapConditions(wrapper, query);
+ wrapper.groupBy("region_id", "billing_date", "record_type", "usage_type");
+ wrapper.orderByDesc("billing_date").orderByAsc("region_id", "record_type", "usage_type");
+ Page> rowPage = billingUsageRecordMapper.selectMapsPage(
+ new Page<>(Math.max(query.getPageNumber(), 1), Math.max(query.getPageSize(), 10)), wrapper);
+ List records = new ArrayList<>();
+ for (Map row : rowPage.getRecords()) {
+ BillingUsageSummaryVo vo = new BillingUsageSummaryVo();
+ vo.setRegionId(stringValue(row.get("region_id")));
+ vo.setBillingDate(toLocalDate(row.get("billing_date")));
+ vo.setRecordType(stringValue(row.get("record_type")));
+ vo.setUsageType(stringValue(row.get("usage_type")));
+ vo.setUsageCount(longValue(row.get("usage_count")));
+ records.add(vo);
+ }
+ Page result = new Page<>(rowPage.getCurrent(), rowPage.getSize(), rowPage.getTotal());
+ result.setRecords(records);
+ return new ResultUtil>().setData(result);
+ }
+
+ @PostMapping("/detailList")
+ @ApiOperation(value = "查询第三方计费用量明细")
+ public Result> detailList(@RequestBody BillingUsageQuery query) {
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getRegionId())) {
+ wrapper.eq(BillingUsageRecord::getRegionId, query.getRegionId());
+ }
+ if (StringUtils.isNotBlank(query.getRecordType())) {
+ wrapper.eq(BillingUsageRecord::getRecordType, query.getRecordType());
+ }
+ if (StringUtils.isNotBlank(query.getUsageType())) {
+ wrapper.eq(BillingUsageRecord::getUsageType, query.getUsageType());
+ }
+ if (StringUtils.isNotBlank(query.getStartDate())) {
+ wrapper.ge(BillingUsageRecord::getBillingDate, LocalDate.parse(query.getStartDate()));
+ }
+ if (StringUtils.isNotBlank(query.getEndDate())) {
+ wrapper.le(BillingUsageRecord::getBillingDate, LocalDate.parse(query.getEndDate()));
+ }
+ wrapper.orderByDesc(BillingUsageRecord::getOccurTime);
+ Page page = new Page<>(Math.max(query.getPageNumber(), 1), Math.max(query.getPageSize(), 10));
+ return new ResultUtil>().setData(billingUsageRecordMapper.selectPage(page, wrapper));
+ }
+
+ private void applyMapConditions(QueryWrapper wrapper, BillingUsageQuery query) {
+ if (StringUtils.isNotBlank(query.getRegionId())) {
+ wrapper.eq("region_id", query.getRegionId());
+ }
+ if (StringUtils.isNotBlank(query.getRecordType())) {
+ wrapper.eq("record_type", query.getRecordType());
+ }
+ if (StringUtils.isNotBlank(query.getUsageType())) {
+ wrapper.eq("usage_type", query.getUsageType());
+ }
+ if (StringUtils.isNotBlank(query.getStartDate())) {
+ wrapper.ge("billing_date", LocalDate.parse(query.getStartDate()));
+ }
+ if (StringUtils.isNotBlank(query.getEndDate())) {
+ wrapper.le("billing_date", LocalDate.parse(query.getEndDate()));
+ }
+ }
+
+ private String stringValue(Object value) {
+ return value == null ? null : String.valueOf(value);
+ }
+
+ private Long longValue(Object value) {
+ if (value instanceof Number) {
+ return ((Number) value).longValue();
+ }
+ return value == null ? 0L : Long.parseLong(String.valueOf(value));
+ }
+
+ private LocalDate toLocalDate(Object value) {
+ if (value instanceof LocalDate) {
+ return (LocalDate) value;
+ }
+ return value == null ? null : LocalDate.parse(String.valueOf(value));
+ }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminDataStatisticsController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminDataStatisticsController.java
new file mode 100644
index 00000000..9da8d939
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminDataStatisticsController.java
@@ -0,0 +1,299 @@
+package cc.hiver.mall.controller;
+
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.billing.entity.BillingUsageRecord;
+import cc.hiver.mall.billing.mapper.BillingUsageRecordMapper;
+import cc.hiver.mall.dao.mapper.*;
+import cc.hiver.mall.entity.*;
+import cc.hiver.mall.planet.entity.PlanetPool;
+import cc.hiver.mall.planet.mapper.PlanetPoolMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@RestController
+@Api(tags = "后台管理系统数据统计接口")
+@RequestMapping("/hiver/mall/admin/dataStatistics")
+public class AdminDataStatisticsController {
+
+ private static final BigDecimal WECHAT_FEE_RATE = new BigDecimal("0.006");
+ private static final BigDecimal ONE_PERCENT = new BigDecimal("0.01");
+ private static final BigDecimal SMS_UNIT_PRICE = new BigDecimal("0.05");
+ private static final BigDecimal CONTENT_AUDIT_PACKAGE_PRICE = new BigDecimal("0.05");
+ private static final BigDecimal REAL_NAME_UNIT_PRICE = BigDecimal.ONE;
+
+ private static final String REWARD_FREE_ORDER = "免单奖励";
+ private static final String REWARD_COLLEGE_RANK = "学院排位赛排名奖励";
+ private static final String REWARD_DELIVERY_RANK = "配送排名奖励";
+
+ @Autowired
+ private MallOrderMapper mallOrderMapper;
+ @Autowired
+ private MallRefundRecordMapper mallRefundRecordMapper;
+ @Autowired
+ private MallDeliveryOrderMapper mallDeliveryOrderMapper;
+ @Autowired
+ private MallUserCouponMapper mallUserCouponMapper;
+ @Autowired
+ private DealingsRecordMapper dealingsRecordMapper;
+ @Autowired
+ private PlanetPoolMapper planetPoolMapper;
+ @Autowired
+ private BillingUsageRecordMapper billingUsageRecordMapper;
+
+ @Data
+ public static class DataStatisticsQuery {
+ @ApiModelProperty(value = "校区/学校ID")
+ private String regionId;
+ @ApiModelProperty(value = "开始日期，格式yyyy-MM-dd，默认今日")
+ private String startDate;
+ @ApiModelProperty(value = "结束日期，格式yyyy-MM-dd，默认今日")
+ private String endDate;
+ }
+
+ @Data
+ public static class DataStatisticsSummaryVo {
+ private String startDate;
+ private String endDate;
+ private Long orderCount;
+ private BigDecimal grossFlowAmount;
+ private BigDecimal effectiveFlowAmount;
+ private BigDecimal koiDiscountAmount;
+ private BigDecimal onTimeRate;
+ private BigDecimal refundAmount;
+ private BigDecimal afterSaleAmount;
+ private BigDecimal couponDiscountAmount;
+ private BigDecimal customerAverageAmount;
+ private BigDecimal actualIncomeAmount;
+ private BigDecimal headquartersDeductionAmount;
+ private BigDecimal deliveryFeeAmount;
+ private Long smsCount;
+ private Long contentAuditCount;
+ private Long realNameAuthCount;
+ private BigDecimal smsCostAmount;
+ private BigDecimal contentAuditCostAmount;
+ private BigDecimal realNameAuthCostAmount;
+ private BigDecimal collegeRankRewardAmount;
+ private BigDecimal drawPoolAmount;
+ private BigDecimal deliveryRankRewardAmount;
+ private Long orderShopCount;
+ private Long orderUserCount;
+ }
+
+ @PostMapping("/summary")
+ @ApiOperation(value = "按校区和日期范围获取数据统计汇总")
+ public Result summary(@RequestBody DataStatisticsQuery query) {
+ DateRange range = resolveDateRange(query);
+ String regionId = query == null ? null : query.getRegionId();
+
+ List orders = mallOrderMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), MallOrder::getRegionId, regionId)
+ .ge(MallOrder::getPayTime, range.start)
+ .le(MallOrder::getPayTime, range.end)
+ .notIn(MallOrder::getStatus, 0, 6));
+
+ List refunds = mallRefundRecordMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), MallRefundRecord::getRegionId, regionId)
+ .ge(MallRefundRecord::getSuccessTime, range.start)
+ .le(MallRefundRecord::getSuccessTime, range.end)
+ .in(MallRefundRecord::getStatus, 1, 4));
+
+ List deliveries = mallDeliveryOrderMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), MallDeliveryOrder::getRegionId, regionId)
+ .ge(MallDeliveryOrder::getFinishTime, range.start)
+ .le(MallDeliveryOrder::getFinishTime, range.end)
+ .isNotNull(MallDeliveryOrder::getFinishTime));
+
+ List coupons = mallUserCouponMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), MallUserCoupon::getRegionId, regionId)
+ .in(MallUserCoupon::getStatus, 1,2)
+ .ge(MallUserCoupon::getUseTime, range.start)
+ .le(MallUserCoupon::getUseTime, range.end));
+
+ List rewardRecords = dealingsRecordMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), DealingsRecord::getRegionId, regionId)
+ .ge(DealingsRecord::getDealingsTime, range.start)
+ .le(DealingsRecord::getDealingsTime, range.end)
+ .in(DealingsRecord::getDealingsWay, REWARD_FREE_ORDER, REWARD_COLLEGE_RANK, REWARD_DELIVERY_RANK));
+
+ List pools = planetPoolMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), PlanetPool::getRegionId, regionId)
+ .ge(PlanetPool::getDrawTime, range.start)
+ .le(PlanetPool::getDrawTime, range.end));
+
+ List billingRecords = billingUsageRecordMapper.selectList(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotBlank(regionId), BillingUsageRecord::getRegionId, regionId)
+ .ge(BillingUsageRecord::getBillingDate, range.startDate)
+ .le(BillingUsageRecord::getBillingDate, range.endDate));
+
+ DataStatisticsSummaryVo vo = new DataStatisticsSummaryVo();
+ vo.setStartDate(range.startDate.toString());
+ vo.setEndDate(range.endDate.toString());
+
+ BigDecimal goodsAndPackage = BigDecimal.ZERO;
+ BigDecimal deliveryFee = BigDecimal.ZERO;
+ Set shopIds = new HashSet<>();
+ Set userIds = new HashSet<>();
+ for (MallOrder order : orders) {
+ goodsAndPackage = goodsAndPackage.add(amount(order.getGoodsAmount())).add(amount(order.getPackageFee()));
+ deliveryFee = deliveryFee.add(amount(order.getDeliveryFee()));
+ if (StringUtils.isNotBlank(order.getShopId())) {
+ shopIds.add(order.getShopId());
+ }
+ if (StringUtils.isNotBlank(order.getUserId())) {
+ userIds.add(order.getUserId());
+ }
+ }
+
+ BigDecimal deliveryFeeAmount = subtractWechatFee(deliveryFee);
+ BigDecimal customerAverageBase = subtractWechatFee(goodsAndPackage);
+ BigDecimal grossFlow = subtractWechatFee(goodsAndPackage.add(deliveryFee));
+ BigDecimal refundAmount = sumRefundAmount(refunds, 1);
+ BigDecimal afterSaleAmount = sumRefundAmount(refunds, 4);
+ BigDecimal effectiveFlow = grossFlow.subtract(refundAmount).subtract(afterSaleAmount).subtract(deliveryFeeAmount);
+ BigDecimal headquartersDeduction = effectiveFlow.multiply(ONE_PERCENT);
+
+ BigDecimal koiDiscount = sumDealingsAmount(rewardRecords, REWARD_FREE_ORDER);
+ BigDecimal collegeRankReward = sumDealingsAmount(rewardRecords, REWARD_COLLEGE_RANK);
+ BigDecimal deliveryRankReward = sumDealingsAmount(rewardRecords, REWARD_DELIVERY_RANK);
+ BigDecimal couponDiscount = coupons.stream()
+ .map(MallUserCoupon::getDiscountAmount)
+ .map(this::amount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal drawPoolAmount = pools.stream()
+ .map(PlanetPool::getPoolAmount)
+ .map(this::amount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ long smsCount = billingRecords.stream().filter(item -> "sms".equals(item.getRecordType())).count();
+ long contentAuditCount = billingRecords.stream().filter(item -> "content_audit".equals(item.getRecordType())).count();
+ long realNameAuthCount = billingRecords.stream().filter(item -> "real_name_auth".equals(item.getRecordType())).count();
+ BigDecimal smsCost = BigDecimal.valueOf(smsCount).multiply(SMS_UNIT_PRICE);
+ BigDecimal contentAuditCost = BigDecimal.valueOf((contentAuditCount + 99) / 100).multiply(CONTENT_AUDIT_PACKAGE_PRICE);
+ BigDecimal realNameCost = BigDecimal.valueOf(realNameAuthCount).multiply(REAL_NAME_UNIT_PRICE);
+ BigDecimal actualIncome = effectiveFlow
+ .subtract(headquartersDeduction)
+ .subtract(koiDiscount)
+ .subtract(collegeRankReward)
+ .subtract(drawPoolAmount)
+ .subtract(deliveryRankReward)
+ .subtract(smsCost)
+ .subtract(contentAuditCost)
+ .subtract(realNameCost);
+
+ vo.setOrderCount((long) orders.size());
+ vo.setGrossFlowAmount(money(grossFlow));
+ vo.setDeliveryFeeAmount(money(deliveryFeeAmount));
+ vo.setRefundAmount(money(refundAmount));
+ vo.setAfterSaleAmount(money(afterSaleAmount));
+ vo.setEffectiveFlowAmount(money(effectiveFlow));
+ vo.setKoiDiscountAmount(money(koiDiscount));
+ vo.setCouponDiscountAmount(money(couponDiscount));
+ vo.setOnTimeRate(onTimeRate(deliveries));
+ vo.setCustomerAverageAmount(orders.isEmpty() ? BigDecimal.ZERO : money(customerAverageBase.divide(BigDecimal.valueOf(orders.size()), 4, RoundingMode.HALF_UP)));
+ vo.setHeadquartersDeductionAmount(money(headquartersDeduction));
+ vo.setActualIncomeAmount(money(actualIncome));
+ vo.setSmsCount(smsCount);
+ vo.setContentAuditCount(contentAuditCount);
+ vo.setRealNameAuthCount(realNameAuthCount);
+ vo.setSmsCostAmount(money(smsCost));
+ vo.setContentAuditCostAmount(money(contentAuditCost));
+ vo.setRealNameAuthCostAmount(money(realNameCost));
+ vo.setCollegeRankRewardAmount(money(collegeRankReward));
+ vo.setDrawPoolAmount(money(drawPoolAmount));
+ vo.setDeliveryRankRewardAmount(money(deliveryRankReward));
+ vo.setOrderShopCount((long) shopIds.size());
+ vo.setOrderUserCount((long) userIds.size());
+ return new ResultUtil().setData(vo);
+ }
+
+ private BigDecimal sumRefundAmount(List refunds, int status) {
+ return refunds.stream()
+ .filter(item -> item.getStatus() != null && item.getStatus() == status)
+ .map(MallRefundRecord::getRefundAmount)
+ .map(this::amount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ private BigDecimal sumDealingsAmount(List records, String dealingsWay) {
+ return records.stream()
+ .filter(item -> dealingsWay.equals(item.getDealingsWay()))
+ .map(DealingsRecord::getAmount)
+ .map(this::amount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ private BigDecimal onTimeRate(List deliveries) {
+ if (deliveries == null || deliveries.isEmpty()) {
+ return BigDecimal.ZERO;
+ }
+ long onTime = deliveries.stream()
+ .filter(item -> item.getFinishTime() != null && item.getMustFinishTime() != null
+ && !item.getFinishTime().after(item.getMustFinishTime()))
+ .count();
+ return BigDecimal.valueOf(onTime)
+ .multiply(new BigDecimal("100"))
+ .divide(BigDecimal.valueOf(deliveries.size()), 2, RoundingMode.HALF_UP);
+ }
+
+ private BigDecimal subtractWechatFee(BigDecimal value) {
+ return amount(value).multiply(BigDecimal.ONE.subtract(WECHAT_FEE_RATE));
+ }
+
+ private BigDecimal amount(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
+
+ private BigDecimal money(BigDecimal value) {
+ return amount(value).setScale(2, RoundingMode.HALF_UP);
+ }
+
+ private DateRange resolveDateRange(DataStatisticsQuery query) {
+ LocalDate today = LocalDate.now();
+ LocalDate startDate = parseDate(query == null ? null : query.getStartDate(), today);
+ LocalDate endDate = parseDate(query == null ? null : query.getEndDate(), startDate);
+ if (endDate.isBefore(startDate)) {
+ endDate = startDate;
+ }
+ DateRange range = new DateRange();
+ range.startDate = startDate;
+ range.endDate = endDate;
+ range.start = Date.from(LocalDateTime.of(startDate, LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant());
+ range.end = Date.from(LocalDateTime.of(endDate, LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant());
+ return range;
+ }
+
+ private LocalDate parseDate(String value, LocalDate defaultValue) {
+ if (StringUtils.isBlank(value)) {
+ return defaultValue;
+ }
+ return LocalDate.parse(value);
+ }
+
+ private static class DateRange {
+ private LocalDate startDate;
+ private LocalDate endDate;
+ private Date start;
+ private Date end;
+ }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminSettlementController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminSettlementController.java
index b2e238f7..d3f3bd18 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminSettlementController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminSettlementController.java
@@ -9,6 +9,7 @@ import cc.hiver.mall.service.ShopService;
import cc.hiver.mall.service.mybatis.MallOrderService;
import cc.hiver.mall.service.mybatis.MallSettlementRecordService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -23,8 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -98,6 +97,8 @@ public class AdminSettlementController {
public static class SummaryQuery {
@ApiModelProperty(value = "区域ID")
private String regionId;
+ @ApiModelProperty(value = "商家ID")
+ private String shopId;
@ApiModelProperty(value = "结算日期，格式yyyy-MM-dd")
private String settlementDate;
@ApiModelProperty(value = "结算状态 0待结算 1已结算")
@@ -151,76 +152,65 @@ public class AdminSettlementController {
return ResultUtil.error("区域ID或日期不能为空");
}
- LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
- qw.eq(MallSettlementRecord::getRegionId, query.getRegionId());
- qw.eq(MallSettlementRecord::getStatus, query.getStatus() == null ? 0 : query.getStatus());
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.select("shop_id",
+ "COALESCE(SUM(base_amount), 0) AS total_base_amount",
+ "COALESCE(SUM(commission_amount), 0) AS total_commission_amount",
+ "COALESCE(SUM(settlement_amount), 0) AS total_settlement_amount",
+ "COUNT(1) AS record_count",
+ "SUM(CASE WHEN type = 2 THEN 0 ELSE 1 END) AS positive_count",
+ "SUM(CASE WHEN type = 2 THEN 1 ELSE 0 END) AS negative_count",
+ "COALESCE(SUM(CASE WHEN type = 2 THEN 0 ELSE settlement_amount END), 0) AS positive_settlement_amount",
+ "COALESCE(SUM(CASE WHEN type = 2 THEN settlement_amount ELSE 0 END), 0) AS negative_settlement_amount");
+ qw.eq("region_id", query.getRegionId());
+ if (StringUtils.isNotBlank(query.getShopId())) {
+ qw.eq("shop_id", query.getShopId());
+ }
+ qw.eq("status", query.getStatus() == null ? 0 : query.getStatus());
qw.apply("DATE(create_time) = {0}", query.getSettlementDate());
+ qw.groupBy("shop_id");
+ qw.orderByAsc("shop_id");
- List list = mallSettlementRecordService.list(qw);
-
- // Group by shopId
- Map> map = list.stream().collect(Collectors.groupingBy(MallSettlementRecord::getShopId));
- List shopIds = map.keySet().stream()
+ Page> rowPage = mallSettlementRecordService.pageMaps(
+ new Page<>(pageNumber(query), pageSize(query)), qw);
+ List shopIds = rowPage.getRecords().stream()
+ .map(row -> stringValue(row.get("shop_id")))
.filter(StringUtils::isNotBlank)
.collect(Collectors.toList());
Map shopMap = shopIds.isEmpty() ? new java.util.HashMap<>() : shopService.getRepository().findAllById(shopIds).stream()
.collect(Collectors.toMap(Shop::getId, Function.identity(), (a, b) -> a));
- List result = new ArrayList<>();
- for (Map.Entry> entry : map.entrySet()) {
- String shopId = entry.getKey();
- List shopRecords = entry.getValue();
-
+ List records = new java.util.ArrayList<>();
+ for (Map row : rowPage.getRecords()) {
+ String shopId = stringValue(row.get("shop_id"));
SettlementSummaryVo vo = new SettlementSummaryVo();
vo.setShopId(shopId);
-
Shop shop = shopMap.get(shopId);
if (shop != null) {
vo.setShopName(shop.getShopName());
}
-
- BigDecimal totalBase = BigDecimal.ZERO;
- BigDecimal totalComm = BigDecimal.ZERO;
- BigDecimal totalSettlement = BigDecimal.ZERO;
- BigDecimal positiveSettlement = BigDecimal.ZERO;
- BigDecimal negativeSettlement = BigDecimal.ZERO;
- int positiveCount = 0;
- int negativeCount = 0;
-
- for (MallSettlementRecord r : shopRecords) {
- if (r.getBaseAmount() != null) totalBase = totalBase.add(r.getBaseAmount());
- if (r.getCommissionAmount() != null) totalComm = totalComm.add(r.getCommissionAmount());
- if (r.getSettlementAmount() != null) totalSettlement = totalSettlement.add(r.getSettlementAmount());
- if (r.getType() != null && r.getType() == 2) {
- negativeCount++;
- if (r.getSettlementAmount() != null) negativeSettlement = negativeSettlement.add(r.getSettlementAmount());
- } else {
- positiveCount++;
- if (r.getSettlementAmount() != null) positiveSettlement = positiveSettlement.add(r.getSettlementAmount());
- }
- }
vo.setBillTime(query.getSettlementDate());
- vo.setTotalBaseAmount(totalBase);
- vo.setTotalCommissionAmount(totalComm);
- vo.setTotalSettlementAmount(totalSettlement);
- vo.setRecordCount(shopRecords.size());
- vo.setPositiveCount(positiveCount);
- vo.setNegativeCount(negativeCount);
- vo.setPositiveSettlementAmount(positiveSettlement);
- vo.setNegativeSettlementAmount(negativeSettlement);
+ vo.setTotalBaseAmount(decimalValue(row.get("total_base_amount")));
+ vo.setTotalCommissionAmount(decimalValue(row.get("total_commission_amount")));
+ vo.setTotalSettlementAmount(decimalValue(row.get("total_settlement_amount")));
+ vo.setRecordCount(intValue(row.get("record_count")));
+ vo.setPositiveCount(intValue(row.get("positive_count")));
+ vo.setNegativeCount(intValue(row.get("negative_count")));
+ vo.setPositiveSettlementAmount(decimalValue(row.get("positive_settlement_amount")));
+ vo.setNegativeSettlementAmount(decimalValue(row.get("negative_settlement_amount")));
vo.setStatus(query.getStatus() == null ? 0 : query.getStatus());
if (vo.getStatus() == 0) {
- vo.setPendingSettlementAmount(totalSettlement);
+ vo.setPendingSettlementAmount(vo.getTotalSettlementAmount());
vo.setConfirmedSettlementAmount(BigDecimal.ZERO);
} else {
vo.setPendingSettlementAmount(BigDecimal.ZERO);
- vo.setConfirmedSettlementAmount(totalSettlement);
+ vo.setConfirmedSettlementAmount(vo.getTotalSettlementAmount());
}
-
- result.add(vo);
+ records.add(vo);
}
- result.sort(Comparator.comparing(vo -> StringUtils.defaultString(vo.getShopName(), vo.getShopId())));
- return new ResultUtil>().setData(buildPage(result, query));
+ Page result = new Page<>(rowPage.getCurrent(), rowPage.getSize(), rowPage.getTotal());
+ result.setRecords(records);
+ return new ResultUtil>().setData(result);
}
@Data
@@ -248,43 +238,52 @@ public class AdminSettlementController {
@PostMapping("/dateSummaryList")
@ApiOperation(value = "按日期获取结算汇总")
public Result> dateSummaryList(@RequestBody SummaryQuery query) {
- if (StringUtils.isBlank(query.getRegionId())) {
- return ResultUtil.error("区域ID不能为空");
+ if (StringUtils.isBlank(query.getRegionId()) && StringUtils.isBlank(query.getShopId())) {
+ return ResultUtil.error("区域ID或商家ID不能为空");
}
- LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
- qw.eq(MallSettlementRecord::getRegionId, query.getRegionId());
- qw.eq(MallSettlementRecord::getStatus, query.getStatus() == null ? 0 : query.getStatus());
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.select("DATE(create_time) AS bill_time",
+ "COUNT(DISTINCT shop_id) AS shop_count",
+ "COUNT(1) AS record_count",
+ "COALESCE(SUM(base_amount), 0) AS total_base_amount",
+ "COALESCE(SUM(commission_amount), 0) AS total_commission_amount",
+ "COALESCE(SUM(settlement_amount), 0) AS total_settlement_amount",
+ "COALESCE(SUM(CASE WHEN type = 2 THEN 0 ELSE settlement_amount END), 0) AS positive_settlement_amount",
+ "COALESCE(SUM(CASE WHEN type = 2 THEN settlement_amount ELSE 0 END), 0) AS negative_settlement_amount");
+ if (StringUtils.isNotBlank(query.getRegionId())) {
+ qw.eq("region_id", query.getRegionId());
+ }
+ if (StringUtils.isNotBlank(query.getShopId())) {
+ qw.eq("shop_id", query.getShopId());
+ }
+ qw.eq("status", query.getStatus() == null ? 0 : query.getStatus());
if (StringUtils.isNotBlank(query.getStartDate())) {
qw.apply("DATE(create_time) >= {0}", query.getStartDate());
}
if (StringUtils.isNotBlank(query.getEndDate())) {
qw.apply("DATE(create_time) <= {0}", query.getEndDate());
}
- List list = mallSettlementRecordService.list(qw);
- Map> byDate = list.stream()
- .collect(Collectors.groupingBy(r -> new java.text.SimpleDateFormat("yyyy-MM-dd").format(r.getCreateTime())));
- List result = new ArrayList<>();
- for (Map.Entry> entry : byDate.entrySet()) {
+ qw.groupBy("DATE(create_time)");
+ qw.orderByDesc("bill_time");
+ Page> rowPage = mallSettlementRecordService.pageMaps(
+ new Page<>(pageNumber(query), pageSize(query)), qw);
+ List records = new java.util.ArrayList<>();
+ for (Map row : rowPage.getRecords()) {
DateSummaryVo vo = new DateSummaryVo();
- vo.setBillTime(entry.getKey());
+ vo.setBillTime(stringValue(row.get("bill_time")));
vo.setStatus(query.getStatus() == null ? 0 : query.getStatus());
- vo.setShopCount((int) entry.getValue().stream().map(MallSettlementRecord::getShopId).distinct().count());
- vo.setRecordCount(entry.getValue().size());
- fillAmounts(vo, entry.getValue());
- result.add(vo);
+ vo.setShopCount(intValue(row.get("shop_count")));
+ vo.setRecordCount(intValue(row.get("record_count")));
+ vo.setTotalBaseAmount(decimalValue(row.get("total_base_amount")));
+ vo.setTotalCommissionAmount(decimalValue(row.get("total_commission_amount")));
+ vo.setTotalSettlementAmount(decimalValue(row.get("total_settlement_amount")));
+ vo.setPositiveSettlementAmount(decimalValue(row.get("positive_settlement_amount")));
+ vo.setNegativeSettlementAmount(decimalValue(row.get("negative_settlement_amount")));
+ records.add(vo);
}
- result.sort(Comparator.comparing(DateSummaryVo::getBillTime).reversed());
- return new ResultUtil>().setData(buildPage(result, query));
- }
-
- private Page buildPage(List list, SummaryQuery query) {
- int pageNumber = Math.max(query.getPageNumber(), 1);
- int pageSize = Math.max(query.getPageSize(), 10);
- int fromIndex = Math.min((pageNumber - 1) * pageSize, list.size());
- int toIndex = Math.min(fromIndex + pageSize, list.size());
- Page page = new Page<>(pageNumber, pageSize, list.size());
- page.setRecords(list.subList(fromIndex, toIndex));
- return page;
+ Page result = new Page<>(rowPage.getCurrent(), rowPage.getSize(), rowPage.getTotal());
+ result.setRecords(records);
+ return new ResultUtil>().setData(result);
}
@Data
@@ -293,11 +292,13 @@ public class AdminSettlementController {
private String settlementDate;
private String shopId;
private Integer status;
+ private int pageNumber = 1;
+ private int pageSize = 10;
}
@PostMapping("/detailList")
@ApiOperation(value = "按日期/商家获取结算明细")
- public Result> detailList(@RequestBody DetailQuery query) {
+ public Result> detailList(@RequestBody DetailQuery query) {
LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(query.getRegionId())) {
qw.eq(MallSettlementRecord::getRegionId, query.getRegionId());
@@ -312,7 +313,9 @@ public class AdminSettlementController {
qw.apply("DATE(create_time) = {0}", query.getSettlementDate());
}
qw.orderByDesc(MallSettlementRecord::getCreateTime);
- List list = mallSettlementRecordService.list(qw);
+ Page page = mallSettlementRecordService.page(
+ new Page<>(Math.max(query.getPageNumber(), 1), Math.max(query.getPageSize(), 10)), qw);
+ List list = page.getRecords();
List shopIds = list.stream()
.map(MallSettlementRecord::getShopId)
.filter(StringUtils::isNotBlank)
@@ -340,32 +343,36 @@ public class AdminSettlementController {
record.setPayTime(order.getPayTime());
}
}
- return new ResultUtil>().setData(list);
+ return new ResultUtil>().setData(page);
}
- private void fillAmounts(DateSummaryVo vo, List records) {
- BigDecimal totalBase = BigDecimal.ZERO;
- BigDecimal totalComm = BigDecimal.ZERO;
- BigDecimal totalSettlement = BigDecimal.ZERO;
- BigDecimal positiveSettlement = BigDecimal.ZERO;
- BigDecimal negativeSettlement = BigDecimal.ZERO;
- for (MallSettlementRecord r : records) {
- if (r.getBaseAmount() != null) totalBase = totalBase.add(r.getBaseAmount());
- if (r.getCommissionAmount() != null) totalComm = totalComm.add(r.getCommissionAmount());
- if (r.getSettlementAmount() != null) {
- totalSettlement = totalSettlement.add(r.getSettlementAmount());
- if (r.getType() != null && r.getType() == 2) {
- negativeSettlement = negativeSettlement.add(r.getSettlementAmount());
- } else {
- positiveSettlement = positiveSettlement.add(r.getSettlementAmount());
- }
- }
+ private int pageNumber(SummaryQuery query) {
+ return query == null ? 1 : Math.max(query.getPageNumber(), 1);
+ }
+
+ private int pageSize(SummaryQuery query) {
+ return query == null ? 10 : Math.max(query.getPageSize(), 10);
+ }
+
+ private String stringValue(Object value) {
+ return value == null ? null : String.valueOf(value);
+ }
+
+ private BigDecimal decimalValue(Object value) {
+ if (value == null) {
+ return BigDecimal.ZERO;
+ }
+ if (value instanceof BigDecimal) {
+ return (BigDecimal) value;
+ }
+ return new BigDecimal(String.valueOf(value));
+ }
+
+ private Integer intValue(Object value) {
+ if (value instanceof Number) {
+ return ((Number) value).intValue();
}
- vo.setTotalBaseAmount(totalBase);
- vo.setTotalCommissionAmount(totalComm);
- vo.setTotalSettlementAmount(totalSettlement);
- vo.setPositiveSettlementAmount(positiveSettlement);
- vo.setNegativeSettlementAmount(negativeSettlement);
+ return value == null ? 0 : Integer.parseInt(String.valueOf(value));
}
@Data
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
index df70e116..5a48519b 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnCommissionController.java
@@ -33,6 +33,7 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
@Slf4j
@RestController
@@ -42,6 +43,8 @@ import java.util.concurrent.TimeUnit;
public class ReturnCommissionController {
private static final long WITHDRAW_REQUEST_LOCK_MINUTES = 30L;
private static final long WITHDRAW_ACCOUNT_LOCK_SECONDS = 120L;
+ private static final Pattern PHONE_PATTERN = Pattern.compile("^1[3-9]\\d{9}$");
+ private static final Pattern EMAIL_PATTERN = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
@Autowired
private ReturnCommissionService returnCommissionService;
@@ -163,8 +166,8 @@ public class ReturnCommissionController {
}
//支付宝户名（姓名）
final String name = returnCommission.getAliName(); //shop.getAliName();
- //支付宝账号（手机号）
- final String phoneNumber = returnCommission.getAliAccount();// shop.getAliAccount();
+ //支付宝账号（手机号或邮箱）
+ final String aliAccount = returnCommission.getAliAccount();// shop.getAliAccount();
// 提现金额
final BigDecimal commission = returnCommission.getCommission();
// 店铺当前返佣余额
@@ -177,7 +180,7 @@ public class ReturnCommissionController {
}*/
try {
keepRequestLock = true;
- final AlipayFundTransUniTransferResponse payResult = AliPayNewUtil.pay(phoneNumber, name, String.valueOf(commission), returnCommission.getId());
+ final AlipayFundTransUniTransferResponse payResult = AliPayNewUtil.pay(aliAccount, name, String.valueOf(commission), returnCommission.getId());
if ("SUCCESS".equals(payResult.getStatus())) {
returnCommission.setStatus("1");
aliResult = "支付宝转账成功";
@@ -202,20 +205,23 @@ public class ReturnCommissionController {
dealingsRecordService.save(dealingsRecord);
} else {
returnCommission.setStatus("2");
- returnCommission.setFailMessage("支付宝转账失败");
- returnCommission.setRemark(payResult.getSubMsg());
- aliResult = "支付宝转账失败，请联系管理员！";
+ aliResult = buildAlipayFailReason(payResult);
+ returnCommission.setFailMessage(aliResult);
+ returnCommission.setRemark(aliResult);
}
} catch (AlipayApiException e) {
returnCommission.setStatus("2");
- returnCommission.setFailMessage("支付宝转账失败");
- returnCommission.setRemark(e.getErrMsg());
- aliResult = "支付宝转账失败，请联系管理员！";
+ aliResult = buildAlipayExceptionReason(e);
+ returnCommission.setFailMessage(aliResult);
+ returnCommission.setRemark(aliResult);
}
//2.修改提现记录
result = returnCommissionService.save(returnCommission);
if (result) {
keepRequestLock = true;
+ if ("2".equals(returnCommission.getStatus())) {
+ return ResultUtil.error(aliResult);
+ }
return ResultUtil.success("处理完成," + aliResult);
} else {
return ResultUtil.error("修改提现数据失败," + aliResult);
@@ -272,8 +278,8 @@ public class ReturnCommissionController {
}
//支付宝户名（姓名）
final String name = returnCommission.getAliName(); //shop.getAliName();
- //支付宝账号（手机号）
- final String phoneNumber = returnCommission.getAliAccount();// shop.getAliAccount();
+ //支付宝账号（手机号或邮箱）
+ final String aliAccount = returnCommission.getAliAccount();// shop.getAliAccount();
// 提现金额
final BigDecimal commission = returnCommission.getCommission();
// 店铺当前返佣余额
@@ -286,7 +292,7 @@ public class ReturnCommissionController {
}*/
try {
keepRequestLock = true;
- final AlipayFundTransUniTransferResponse payResult = AliPayNewUtil.pay(phoneNumber, name, String.valueOf(commission), returnCommission.getId());
+ final AlipayFundTransUniTransferResponse payResult = AliPayNewUtil.pay(aliAccount, name, String.valueOf(commission), returnCommission.getId());
if ("SUCCESS".equals(payResult.getStatus())) {
returnCommission.setStatus("1");
aliResult = "支付宝转账成功";
@@ -311,20 +317,23 @@ public class ReturnCommissionController {
dealingsRecordService.save(dealingsRecord);
} else {
returnCommission.setStatus("2");
- returnCommission.setFailMessage("支付宝转账失败");
- returnCommission.setRemark(payResult.getSubMsg());
- aliResult = "支付宝转账失败，请联系管理员！";
+ aliResult = buildAlipayFailReason(payResult);
+ returnCommission.setFailMessage(aliResult);
+ returnCommission.setRemark(aliResult);
}
} catch (AlipayApiException e) {
returnCommission.setStatus("2");
- returnCommission.setFailMessage("支付宝转账失败");
- returnCommission.setRemark(e.getErrMsg());
- aliResult = "支付宝转账失败，请联系管理员！";
+ aliResult = buildAlipayExceptionReason(e);
+ returnCommission.setFailMessage(aliResult);
+ returnCommission.setRemark(aliResult);
}
//2.修改提现记录
result = returnCommissionService.save(returnCommission);
if (result) {
keepRequestLock = true;
+ if ("2".equals(returnCommission.getStatus())) {
+ return ResultUtil.error(aliResult);
+ }
return ResultUtil.success("处理完成," + aliResult);
} else {
return ResultUtil.error("修改提现数据失败," + aliResult);
@@ -381,8 +390,8 @@ public class ReturnCommissionController {
}
//支付宝户名（姓名）
final String name = returnCommission.getAliName(); //shop.getAliName();
- //支付宝账号（手机号）
- final String phoneNumber = returnCommission.getAliAccount();// shop.getAliAccount();
+ //支付宝账号（手机号或邮箱）
+ final String aliAccount = returnCommission.getAliAccount();// shop.getAliAccount();
// 提现金额
final BigDecimal commission = returnCommission.getCommission();
// 店铺当前返佣余额
@@ -395,7 +404,7 @@ public class ReturnCommissionController {
}*/
try {
keepRequestLock = true;
- final AlipayFundTransUniTransferResponse payResult = AliPayNewUtil.pay(phoneNumber, name, String.valueOf(commission), returnCommission.getId());
+ final AlipayFundTransUniTransferResponse payResult = AliPayNewUtil.pay(aliAccount, name, String.valueOf(commission), returnCommission.getId());
if ("SUCCESS".equals(payResult.getStatus())) {
returnCommission.setStatus("1");
aliResult = "支付宝转账成功";
@@ -420,20 +429,23 @@ public class ReturnCommissionController {
dealingsRecordService.save(dealingsRecord);
} else {
returnCommission.setStatus("2");
- returnCommission.setFailMessage("支付宝转账失败");
- returnCommission.setRemark(payResult.getSubMsg());
- aliResult = "支付宝转账失败，请联系管理员！";
+ aliResult = buildAlipayFailReason(payResult);
+ returnCommission.setFailMessage(aliResult);
+ returnCommission.setRemark(aliResult);
}
} catch (AlipayApiException e) {
returnCommission.setStatus("2");
- returnCommission.setFailMessage("支付宝转账失败");
- returnCommission.setRemark(e.getErrMsg());
- aliResult = "支付宝转账失败，请联系管理员！";
+ aliResult = buildAlipayExceptionReason(e);
+ returnCommission.setFailMessage(aliResult);
+ returnCommission.setRemark(aliResult);
}
//2.修改提现记录
result = returnCommissionService.save(returnCommission);
if (result) {
keepRequestLock = true;
+ if ("2".equals(returnCommission.getStatus())) {
+ return ResultUtil.error(aliResult);
+ }
return ResultUtil.success("处理完成," + aliResult);
} else {
return ResultUtil.error("修改提现数据失败," + aliResult);
@@ -461,11 +473,46 @@ public class ReturnCommissionController {
return ResultUtil.error("支付宝实名名称不能为空！");
}
if (StringUtils.isEmpty(returnCommission.getAliAccount())) {
- return ResultUtil.error("支付宝手机号不能为空！");
+ return ResultUtil.error("支付宝账号不能为空！");
+ }
+ returnCommission.setAliName(returnCommission.getAliName().trim());
+ returnCommission.setAliAccount(returnCommission.getAliAccount().trim());
+ if (!isValidAliAccount(returnCommission.getAliAccount())) {
+ return ResultUtil.error("支付宝账号需为手机号或邮箱！");
}
return null;
}
+ private boolean isValidAliAccount(String aliAccount) {
+ final String account = aliAccount == null ? "" : aliAccount.trim();
+ return PHONE_PATTERN.matcher(account).matches() || EMAIL_PATTERN.matcher(account).matches();
+ }
+
+ private String buildAlipayFailReason(AlipayFundTransUniTransferResponse payResult) {
+ if (payResult == null) {
+ return "支付宝转账失败";
+ }
+ return firstNotEmpty(payResult.getSubMsg(), payResult.getMsg(), "支付宝转账失败");
+ }
+
+ private String buildAlipayExceptionReason(AlipayApiException e) {
+ if (e == null) {
+ return "支付宝转账失败";
+ }
+ return firstNotEmpty(e.getErrMsg(), e.getMessage(), "支付宝转账失败");
+ }
+
+ private String firstNotEmpty(String... values) {
+ if (values != null) {
+ for (String value : values) {
+ if (!StringUtils.isEmpty(value)) {
+ return value;
+ }
+ }
+ }
+ return "支付宝转账失败";
+ }
+
private String ensureWithdrawId(ReturnCommission returnCommission) {
if (StringUtils.isEmpty(returnCommission.getId())) {
returnCommission.setId(SnowFlakeUtil.nextId().toString());
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerRelaPriceController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerRelaPriceController.java
index b373a67e..76acb318 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerRelaPriceController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/WorkerRelaPriceController.java
@@ -22,10 +22,13 @@ import cc.hiver.core.entity.Worker;
import cc.hiver.core.service.UserService;
import cc.hiver.core.service.WorkerService;
import cc.hiver.mall.entity.WorkerRelaPrice;
+import cc.hiver.mall.ie.service.IeSecurityAuditService;
+import cc.hiver.mall.ie.vo.IeAuditResult;
import cc.hiver.mall.pojo.vo.WorkerRealPriceVo;
import cc.hiver.mall.pojo.vo.WorkerRedisVo;
import cc.hiver.mall.service.mybatis.WorkerRelaPriceService;
import cc.hiver.mall.utils.WorkerRedisCacheUtil;
+import cn.hutool.core.text.CharSequenceUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -57,6 +60,9 @@ public class WorkerRelaPriceController {
@Autowired
private UserService userService;
+ @Autowired
+ private IeSecurityAuditService auditService;
+
@RequestMapping(value = "/getByWorkerId", method = RequestMethod.GET)
@ApiOperation("根据配送员id获取")
public Result getByProductId(@RequestParam(value = "workerId") String workerId) {
@@ -81,6 +87,16 @@ public class WorkerRelaPriceController {
User user = userService.findById(workerRealPriceVo.getUserId());
Worker worker = workerService.findByUserId(workerRealPriceVo.getUserId());
+ if (CharSequenceUtil.isNotBlank(workerRealPriceVo.getWorkerName())) {
+ Long auditUserId = Long.valueOf(workerRealPriceVo.getUserId());
+ IeAuditResult audit = auditService.audit("worker-name", auditUserId, auditUserId,
+ workerRealPriceVo.getWorkerName(), worker.getRegion());
+ if (Boolean.TRUE.equals(audit.getBlocked())) {
+ throw new RuntimeException("配送员名称未通过审核，请换一个更合适的名称");
+ }
+ workerRealPriceVo.setWorkerName(audit.getFilteredContent());
+ }
+
List workerRelaPriceList = workerRelaPriceService.selectByWorkerId(worker.getWorkerId());
//更新配送员信息
worker.setWorkerName(workerRealPriceVo.getWorkerName());
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnCommission.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnCommission.java
index 9110fcb5..8a3ae516 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnCommission.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnCommission.java
@@ -70,7 +70,7 @@ public class ReturnCommission implements Serializable {
@ApiModelProperty(value = "支付宝昵称")
private String aliName;
- @ApiModelProperty(value = "支付宝手机号")
+ @ApiModelProperty(value = "支付宝账号")
private String aliAccount;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/controller/FishMarketAdminController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/controller/FishMarketAdminController.java
index e0118445..f0e1d853 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/controller/FishMarketAdminController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/fishmarket/controller/FishMarketAdminController.java
@@ -119,6 +119,13 @@ public class FishMarketAdminController {
return ResultUtil.success("处理成功");
}
+ @RequestMapping(value = "/complaints/unblock", method = RequestMethod.POST)
+ @ApiOperation("解除举报封禁")
+ public Result