统计代码

dev
胡锐 1 week ago
parent e2b7dc42a8
commit adb9652554
  1. 104
      bweb/src/main/java/com/bweb/controller/BsTradeOrderController.java
  2. 2
      bweb/src/main/resources/dev/application.yml
  3. 4
      cweb/src/main/java/com/cweb/controller/BsCompanyController.java
  4. 4
      cweb/src/main/java/com/cweb/controller/BsMerController.java
  5. 4
      cweb/src/main/java/com/cweb/controller/BsStoreController.java
  6. 4
      cweb/src/main/java/com/cweb/controller/BsTradeOrderController.java
  7. 2
      cweb/src/main/resources/dev/application.yml
  8. 4
      service/src/main/java/com/hfkj/dao/BsMerMapper.java
  9. 2
      service/src/main/java/com/hfkj/dao/BsTradeOrderMapperExt.java
  10. 9
      service/src/main/java/com/hfkj/dao/BsTradeSettleMapperExt.java
  11. 7
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java

@ -34,6 +34,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Controller
@Api(value = "交易订单")
@ -72,6 +73,8 @@ public class BsTradeOrderController {
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@ -135,6 +138,8 @@ public class BsTradeOrderController {
param.put("accTradeNo", accTradeNo);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("status", status);
param.put("specialField", specialField);
@ -147,6 +152,101 @@ public class BsTradeOrderController {
}
}
@RequestMapping(value="/countOrderData",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询订单列表")
public ResponseData countOrderData(@RequestParam(value = "salesmanId" , required = false) Long salesmanId,
@RequestParam(value = "merId" , required = false) Long merId,
@RequestParam(value = "merNo" , required = false) String merNo,
@RequestParam(value = "merName" , required = false) String merName,
@RequestParam(value = "merAbbreviate" , required = false) String merAbbreviate,
@RequestParam(value = "companyId" , required = false) Long companyId,
@RequestParam(value = "agentId" , required = false) Long agentId,
@RequestParam(value = "storeId" , required = false) Long storeId,
@RequestParam(value = "storeName" , required = false) String storeName,
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@RequestParam(value = "specialField" , required = false) String specialField) {
try {
Map<String, Object> param = new HashMap<>();
UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class);
if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) {
param.put("companyId", companyId);
param.put("agentId", agentId);
param.put("salesmanId", salesmanId);
param.put("merId", merId);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("merNo", merNo);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) {
param.put("companyId", userModel.getBsCompany().getId()>2?userModel.getBsCompany().getId():null);
param.put("agentId", agentId);
param.put("salesmanId", salesmanId);
param.put("merId", merId);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("merNo", merNo);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) {
param.put("agentId", userModel.getAgent().getId());
param.put("salesmanId", salesmanId);
param.put("merId", merId);
param.put("merNo", merNo);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) {
param.put("salesmanId", userModel.getSalesman().getId());
param.put("merId", merId);
param.put("merNo", merNo);
param.put("merName", merName);
param.put("merAbbreviate", merAbbreviate);
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) {
param.put("merId", userModel.getMer().getId());
param.put("storeId", storeId);
param.put("storeName", storeName);
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type5.getNumber())) {
param.put("storeId", userModel.getStore().getId());
}
param.put("payMode", payMode);
param.put("outTradeNo", outTradeNo);
param.put("accTradeNo", accTradeNo);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("status", status);
param.put("specialField", specialField);
Map<String, Object> countData = tradeOrderService.countTradeOrderPrice(param);
Map<String,Object> map = new HashMap<>();
map.put("totalCount", countData.get("count"));
map.put("totalPrice", countData.get("tradePrice"));
return ResponseMsgUtil.success(map);
} catch (Exception e) {
log.error(e.getMessage(), e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/exportTradeOrder",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "导出交易订单")
@ -162,6 +262,8 @@ public class BsTradeOrderController {
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@ -222,6 +324,8 @@ public class BsTradeOrderController {
param.put("payMode", payMode);
param.put("outTradeNo", outTradeNo);
param.put("accTradeNo", accTradeNo);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("status", status);

@ -9,7 +9,7 @@ debug: false
#datasource数据源设置
spring:
datasource:
url: jdbc:mysql://139.9.154.68:3306/gratia_pay?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://139.9.154.68:3306/gratia_pay_prod?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: HF123456.
type: com.alibaba.druid.pool.DruidDataSource

@ -63,14 +63,14 @@ public class BsCompanyController {
payTimeS.set(Calendar.HOUR_OF_DAY, 00);
payTimeS.set(Calendar.MINUTE, 00);
payTimeS.set(Calendar.SECOND, 00);
param.put("payTimeS", payTimeS.getTime());
param.put("createTimeS", payTimeS.getTime());
Calendar payTimeE = Calendar.getInstance();
payTimeE.setTime(new Date());
payTimeE.set(Calendar.HOUR_OF_DAY, 23);
payTimeE.set(Calendar.MINUTE, 59);
payTimeE.set(Calendar.SECOND, 59);
param.put("payTimeE", payTimeE.getTime());
param.put("createTimeE", payTimeE.getTime());
// 今日交易额
Map<String, Object> today = new HashMap<>();

@ -96,14 +96,14 @@ public class BsMerController {
payTimeS.set(Calendar.HOUR_OF_DAY, 00);
payTimeS.set(Calendar.MINUTE, 00);
payTimeS.set(Calendar.SECOND, 00);
param.put("payTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
Calendar payTimeE = Calendar.getInstance();
payTimeE.setTime(new Date());
payTimeE.set(Calendar.HOUR_OF_DAY, 23);
payTimeE.set(Calendar.MINUTE, 59);
payTimeE.set(Calendar.SECOND, 59);
param.put("payTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("storeId", storeStr);

@ -72,14 +72,14 @@ public class BsStoreController {
payTimeS.set(Calendar.HOUR_OF_DAY, 00);
payTimeS.set(Calendar.MINUTE, 00);
payTimeS.set(Calendar.SECOND, 00);
param.put("payTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeS", DateUtil.format(payTimeS.getTime(), "yyyy-MM-dd HH:mm:ss"));
Calendar payTimeE = Calendar.getInstance();
payTimeE.setTime(new Date());
payTimeE.set(Calendar.HOUR_OF_DAY, 23);
payTimeE.set(Calendar.MINUTE, 59);
payTimeE.set(Calendar.SECOND, 59);
param.put("payTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("createTimeE", DateUtil.format(payTimeE.getTime(), "yyyy-MM-dd HH:mm:ss"));
param.put("storeId", userModel.getStore().getId());
// 今日交易额

@ -466,6 +466,8 @@ public class BsTradeOrderController {
@RequestParam(value = "payMode" , required = false) String payMode,
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo,
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo,
@RequestParam(value = "createTimeS" , required = false) Long createTimeS,
@RequestParam(value = "createTimeE" , required = false) Long createTimeE,
@RequestParam(value = "payTimeS" , required = false) Long payTimeS,
@RequestParam(value = "payTimeE" , required = false) Long payTimeE,
@RequestParam(value = "status" , required = false) Integer status,
@ -505,6 +507,8 @@ public class BsTradeOrderController {
param.put("payMode", payMode);
param.put("outTradeNo", outTradeNo);
param.put("accTradeNo", accTradeNo);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
param.put("payTimeS", payTimeS);
param.put("payTimeE", payTimeE);
param.put("status", status);

@ -9,7 +9,7 @@ debug: false
#datasource数据源设置
spring:
datasource:
url: jdbc:mysql://139.9.154.68:3306/gratia_pay?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://139.9.154.68:3306/gratia_pay_prod?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: HF123456.
type: com.alibaba.druid.pool.DruidDataSource

@ -156,6 +156,8 @@ public interface BsMerMapper extends BsMerMapperExt {
"lar_id_card_period_type, lar_id_card_period_start, lar_id_card_period_end, complete_status, ",
"mer_status, period_status, create_salesman_id, create_salesman_name, create_time, ",
"update_time, ext_1, ext_2, ext_3",
"from bs_mer",
"where id = #{id,jdbcType=BIGINT}"
})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@ -268,4 +270,4 @@ public interface BsMerMapper extends BsMerMapperExt {
"where id = #{id,jdbcType=BIGINT}"
})
int updateByPrimaryKey(BsMer record);
}
}

@ -27,6 +27,8 @@ public interface BsTradeOrderMapperExt {
" <if test='param.payMode != null'> and pay_mode = #{param.payMode}</if>" +
" <if test='param.outTradeNo != null'> and out_trade_no like CONCAT('%', #{param.outTradeNo} , '%')</if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no = #{param.accTradeNo}</if>" +
" <if test='param.createTimeS != null'> <![CDATA[ and create_time >= #{param.createTimeS} ]]> </if>" +
" <if test='param.createTimeE != null'> <![CDATA[ and create_time <= #{param.createTimeE} ]]> </if>" +
" <if test='param.payTimeS != null'> <![CDATA[ and pay_time >= #{param.payTimeS} ]]> </if>" +
" <if test='param.payTimeE != null'> <![CDATA[ and pay_time <= #{param.payTimeE} ]]> </if>" +
" <if test='param.status != null'> and status = #{param.status}</if>" +

@ -83,8 +83,8 @@ public interface BsTradeSettleMapperExt {
" case when sum(shd_fee_amt) is null then 0 else sum(shd_fee_amt) end shdFeeAmount" +
" from bs_trade_settle " +
" where mer_no = #{param.merNo} and settle_date between #{param.settleTimeS} and #{param.settleTimeE} and trade_type = 1 and status = 1" +
" <if test='param.outTradeNo != null'> and out_trade_no = #{param.outTradeNo} </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no = #{param.accTradeNo} </if>" +
" <if test='param.outTradeNo != null'> and out_trade_no LIKE CONCAT('%',#{param.outTradeNo},'%') </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no LIKE CONCAT('%',#{param.accTradeNo},'%') </if>" +
" UNION" +
" select " +
" count(1) tradeNum," +
@ -92,9 +92,10 @@ public interface BsTradeSettleMapperExt {
" CONCAT('-', case when sum(settle_amount) is null then 0 else sum(settle_amount) end) settleAmount," +
" CONCAT('-', case when sum(shd_fee_amt) is null then 0 else sum(shd_fee_amt) end) shdFeeAmount" +
" from bs_trade_settle " +
" where mer_no = #{param.merNo} and settle_date between #{param.settleTimeS} and #{param.settleTimeE} and trade_type = 2 and status = 1" +
" <if test='param.outTradeNo != null'> and out_trade_no = #{param.outTradeNo} </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no = #{param.accTradeNo} </if>" +
" <if test='param.outTradeNo != null'> and out_trade_no LIKE CONCAT('%',#{param.outTradeNo},'%') </if>" +
" <if test='param.accTradeNo != null'> and acc_trade_no LIKE CONCAT('%',#{param.accTradeNo},'%') </if>" +
") a" +
" </script>"})
Map<String,Object> queryTradeSettleCount(@Param("param") Map<String, Object> param);

@ -691,6 +691,13 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService {
paramMap.remove("outTradeNo");
}
if (MapUtils.getLong(param, "createTimeS") != null) {
paramMap.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeS")), DateUtil.Y_M_D_HMS));
}
if (MapUtils.getLong(param, "createTimeE") != null) {
paramMap.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeE")), DateUtil.Y_M_D_HMS));
}
if (MapUtils.getLong(param, "payTimeS") != null) {
paramMap.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(param, "payTimeS")), DateUtil.Y_M_D_HMS));
}

Loading…
Cancel
Save