src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
@@ -15,5 +15,7 @@ public interface OrderSettlementMapper extends BaseMapper<OrderSettlement> { List<OrderSettlementListDTO> selectSettlementList(Page page, @Param("condition") OrderSettlementQueryDTO dto); List<OrderSettlementListDTO> selectSettlementListInfo(Page page, @Param("condition") OrderSettlementQueryDTO dto); BigDecimal getUserIncome(@Param("userId") String userId); } src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
@@ -18,7 +18,6 @@ import com.mzl.flower.entity.supplier.Supplier; import com.mzl.flower.entity.system.UserWechat; import com.mzl.flower.entity.wallet.WalletBillRecordDO; import com.mzl.flower.entity.wallet.WalletBillRecordDetail; import com.mzl.flower.entity.wallet.WalletDO; import com.mzl.flower.mapper.flower.FlowerSupplierSaleNumMapper; import com.mzl.flower.mapper.payment.*; @@ -29,6 +28,7 @@ import com.mzl.flower.mapper.wallet.WalletMapper; import com.mzl.flower.service.BaseService; import com.mzl.flower.service.wallet.WalletService; import com.mzl.flower.utils.ExcelExportUtil; import com.mzl.flower.utils.UUIDGenerator; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RLock; @@ -39,8 +39,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URLEncoder; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; @@ -904,4 +906,48 @@ orderMapper.updateById(o); } } public void exportSettlementList(HttpServletResponse response, OrderSettlementQueryDTO dto) { dto.setStartDate(parseLocalDateTime(dto.getStartDateStr(), true)); dto.setEndDate(parseLocalDateTime(dto.getEndDateStr(), false)); List<OrderSettlementListDTO> ls = settlementMapper.selectSettlementListInfo(null, dto); String[] rowsName = new String[]{"序号","结算人", "结算金额(元)", "订单数量", "买家数量", "商品数量", "结算合计(元)", "结算均价(元)", "降级扣款(元)", "缺货扣款(元)", "补货扣款(元)", "售后理赔(元)", "服务费(元)", "集货站运费(元)", "结算类型", "结算状态", "结算时间"}; List<Object[]> dataList = new ArrayList<>(); int sn = 1; for (OrderSettlementListDTO o : ls) { Object[] objs = new Object[rowsName.length]; int a = 0; objs[a++] = sn; objs[a++] = o.getUserName(); objs[a++] = o.getSettlementAmount(); objs[a++] = o.getOrderNum(); objs[a++] = o.getCustomerNum(); objs[a++] = o.getFlowerNum(); objs[a++] = o.getTotalAmount(); objs[a++] = o.getPrice(); objs[a++] = o.getCheckFee(); objs[a++] = o.getLackFee(); objs[a++] = o.getReplaceFee(); objs[a++] = o.getSalesFee(); objs[a++] = o.getServiceFee(); objs[a++] = o.getStationFee(); objs[a++] = o.getTypeStr(); objs[a++] = o.getStatusStr(); objs[a++] = o.getTransferTime(); dataList.add(objs); sn++; } ExcelExportUtil excelExportUtil = new ExcelExportUtil("结算列表", rowsName, dataList, response); try { response.addHeader("filename", URLEncoder.encode("结算列表.xls", "UTF-8")); response.addHeader("Access-Control-Expose-Headers", "filename"); excelExportUtil.export(); } catch (Exception e) { log.error(e.getMessage(), e); } } } src/main/java/com/mzl/flower/web/payment/SettlementController.java
@@ -4,8 +4,6 @@ import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; import com.mzl.flower.config.security.SecurityUtils; import com.mzl.flower.constant.Constants; import com.mzl.flower.dto.request.payment.OrderSettlementQueryDTO; import com.mzl.flower.dto.response.payment.OrderSettlementDTO; import com.mzl.flower.dto.response.payment.OrderSettlementListDTO; @@ -22,6 +20,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("/api/settlement") @@ -43,6 +43,13 @@ return returnData(R.SUCCESS.getCode(), settlementService.selectSettlementList(page, dto)); } @GetMapping("/export") @ApiOperation(value = "结算列表导出") public void exportSettlementList(HttpServletResponse response, OrderSettlementQueryDTO dto) { settlementService.exportSettlementList(response, dto); } @GetMapping("/list/view") @ApiOperation(value = "结算详情") @ApiImplicitParams({ src/main/resources/mapper/payment/OrderSettlementMapper.xml
@@ -29,6 +29,38 @@ ORDER BY s.create_time desc, userName </select> <select id="selectSettlementListInfo" resultType="com.mzl.flower.dto.response.payment.OrderSettlementListDTO"> SELECT s.*, ifnull(si.name, pi.name) userName, code.label as statusStr, code2.label as typeStr FROM t_order_settlement s left join t_supplier_info si on s.user_id = si.user_id left join t_partner_info pi on s.user_id = pi.user_id LEFT JOIN (SELECT ct.label, ct.value from t_code_value ct where type_code = 'SETTLEMENT_STATUS') code ON s.status = code.value LEFT JOIN (SELECT ct.label, ct.value from t_code_value ct where type_code = 'SETTLEMENT_TYPE') code2 ON s.type = code2.value WHERE s.deleted = 0 <if test="condition.userId != null and condition.userId != ''"> AND s.user_id = #{condition.userId} </if> <if test="condition.type != null and condition.type != ''"> AND s.type = #{condition.type} </if> <if test="condition.status != null and condition.status != ''"> AND s.status = #{condition.status} </if> <if test="condition.startDate != null"> AND s.create_time >= #{condition.startDate} </if> <if test="condition.endDate != null"> AND s.create_time <= #{condition.endDate} </if> <if test="condition.userName != null and condition.userName != ''"> AND (si.name LIKE CONCAT('%', #{condition.userName}, '%') OR pi.name LIKE CONCAT('%', #{condition.userName}, '%')) </if> ORDER BY s.create_time desc, userName </select> <select id="getUserIncome" resultType="java.math.BigDecimal"> select sum(settlement_amount) from t_order_settlement
