Просмотр исходного кода

[储值卡][新增]:储值卡花费及补贴

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
0b3aa84d4b
2 измененных файлов: 14 добавлений и 3 удалений
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +13
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java Просмотреть файл

@@ -39,7 +39,7 @@ public class WxCardPayController extends BaseController {
@Autowired
WxCardSpendService wxCardSpendService;

@ApiOperation(value = "C端扫B端储值卡支付订单", notes = "params:{\"cardId\":\"String\",\"merchantCode\":\"String\",\"totalFee\":\"String\"}")
@ApiOperation(value = "C端扫B端储值卡支付订单", notes = "params:{\"cardId\":\"String\",\"merchantCode\":\"String\",\"totalFee\":\"String(元)\"}")
@PostMapping("order_create")
public ResultData saveCardPayOrder(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
String ipStr = getIpAddr();


+ 13
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Просмотреть файл

@@ -37,6 +37,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
@Autowired
WxMerchantMapper wxMerchantMapper;

@Autowired
WxMerchantSubsidyMapper wxMerchantSubsidyMapper;

@Autowired
WxCouponMerchantMapper wxCouponMerchantMapper;

@@ -50,12 +53,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
WxProfitSharingOrderService profitSharingOrderService;

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData createCardSpend(WxCardSpend record, WxOrder order, WxCUser user) {
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
// 1. get card info
WxCardInfo cardInfo = wxCardInfoMapper.selectByPrimaryKey(record.getCardId());
if (cardInfo != null) {
if (cardInfo == null) {
logger.error("card not found: " + record.getCardId());
return new ResultData(ErrorCode.CARD_IS_NOT_FOUND);
}
@@ -110,7 +114,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
record.setCardBeforeAmount(cardInfo.getRemainingAmount());
record.setCardRemainAmount(cardInfo.getRemainingAmount()-record.getDeductionAmount());
record.setCardBeforeRealAmount(cardInfo.getRemainingShareFeeAmount());
record.setCardRemainAmount(cardInfo.getRemainingShareFeeAmount()-real_payment);
record.setCardRemainRealAmount(cardInfo.getRemainingShareFeeAmount()-real_payment);
record.setCreateDate(curDate);
record.setUpdateDate(curDate);
try {
@@ -123,6 +127,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
// 7. update card info
cardInfo.setRemainingAmount(cardInfo.getRemainingAmount()-record.getDeductionAmount());
cardInfo.setRemainingShareFeeAmount(cardInfo.getRemainingShareFeeAmount()-real_payment);
cardInfo.setUpdateDate(curDate);
try {
wxCardInfoMapper.updateByPrimaryKey(cardInfo);
} catch (Exception e) {
@@ -149,6 +154,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode());
merchantSubsidy.setCreateDate(curDate);
merchantSubsidy.setUpdateDate(curDate);
try {
wxMerchantSubsidyMapper.insertSelective(merchantSubsidy);
} catch (Exception e) {
logger.error("merchantSubsidy info insert error");
return new ResultData(ErrorCode.DB_FAIL.getCode(), "merchantSubsidy info 插入出错!");
}
// 9. 分账




Загрузка…
Отмена
Сохранить