Procházet zdrojové kódy

[刷卡支付][收银台]:每日amount+交易流水

release_toaliyun_real
Stormeye Wu před 7 roky
rodič
revize
35ed374879
2 změnil soubory, kde provedl 14 přidání a 5 odebrání
  1. +8
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +6
    -5
      mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java

+ 8
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Zobrazit soubor

@@ -214,6 +214,14 @@ public class WxMicroPayController extends BaseController {
return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize); return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize);
} }


@ApiOperation("刷卡支付某日期交易总流水")
@GetMapping("getMicroPayAmountOnDate")
@ApiImplicitParams({
@ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")})
public ResultData getMicroPayAmountOnDate(String date) {
return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, null, null);
}



@ApiOperation(value = "刷卡支付退款", notes = "{\"orderId\":\"string\"}") @ApiOperation(value = "刷卡支付退款", notes = "{\"orderId\":\"string\"}")
@PostMapping("/microPayRefund") @PostMapping("/microPayRefund")


+ 6
- 5
mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java Zobrazit soubor

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;


import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@@ -42,8 +43,8 @@ public class DaliyAmountSchedule {






@Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点盘点前一天的数据
//@Scheduled(cron = "*/30 * * * * ?") // 测试10秒中一次
//@Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点盘点前一天的数据
@Scheduled(cron = "*/30 * * * * ?") // 测试10秒中一次
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void daliyAmountSchedule() { public void daliyAmountSchedule() {


@@ -125,13 +126,13 @@ public class DaliyAmountSchedule {
wxDateAmountRecordService.saveAmount(dateAmountRecord); wxDateAmountRecordService.saveAmount(dateAmountRecord);


Map microPayMap = wxOrderMapper.dayMicroPayAmountList(dateMap); Map microPayMap = wxOrderMapper.dayMicroPayAmountList(dateMap);
int countMic = (int) microPayMap.get("count");
int totalPriceMic = (int) microPayMap.get("totalPrice");
Long countMic = (Long) microPayMap.get("count");
BigDecimal totalPriceMic = (BigDecimal) microPayMap.get("total_price");
logger.info("find " + countMic + " order " + "\n" + logger.info("find " + countMic + " order " + "\n" +
"from " + startDate + " to " + new Date() + "\n" + "from " + startDate + " to " + new Date() + "\n" +
"TOTAL Payment=" + totalPriceMic); "TOTAL Payment=" + totalPriceMic);


dateAmountRecord.setPayPrice(totalPriceMic);
dateAmountRecord.setPayPrice(totalPriceMic.intValue());
dateAmountRecord.setType(EnumDateAmtType.MICROPAY_RECORD.getCode()); dateAmountRecord.setType(EnumDateAmtType.MICROPAY_RECORD.getCode());
wxDateAmountRecordService.saveAmount(dateAmountRecord); wxDateAmountRecordService.saveAmount(dateAmountRecord);




Načítá se…
Zrušit
Uložit