浏览代码

[储值卡][新增]:补贴金额允许带小数

release_toaliyun_real
Stormeye Wu 7 年前
父节点
当前提交
b849393053
共有 3 个文件被更改,包括 9 次插入7 次删除
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxSubsidyController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxSubsidyService.java
  3. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxSubsidyController.java 查看文件

@@ -36,8 +36,8 @@ public class WxSubsidyController extends BaseController {
@ApiOperation("补贴扫码支付发起") @ApiOperation("补贴扫码支付发起")
@GetMapping("prePay") @GetMapping("prePay")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "amount", value = "金额", dataType = "int", paramType = "query", required = true)})
public void subsidyPrepay(Integer amount, HttpServletResponse response) throws Exception {
@ApiImplicitParam(name = "amount", value = "金额", dataType = "String", paramType = "query", required = true)})
public void subsidyPrepay(String amount, HttpServletResponse response) throws Exception {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("subsidyPrepay: " + ipStr + "-" + amount); logger.info("subsidyPrepay: " + ipStr + "-" + amount);
MallUserInfo userInfo = getUser(); MallUserInfo userInfo = getUser();


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxSubsidyService.java 查看文件

@@ -12,10 +12,10 @@ public interface WxSubsidyService {


/** /**
* 创建补贴订单 * 创建补贴订单
* @param amount
* @param amountStr
* @return * @return
*/ */
ResultData createSubsidy(MallUserInfo user, String ip, Integer amount);
ResultData createSubsidy(MallUserInfo user, String ip, String amountStr);


/** /**
* 根据实体查询分页列表 * 根据实体查询分页列表


+ 5
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java 查看文件

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;


@@ -81,7 +82,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService {
"\"XML_FORMAT_ERROR\":{\"detail\":\"XML格式错误\t\",\"reason\":\"XML格式错误\",\"reason\":\"请检查XML参数格式是否正确\"}}"); "\"XML_FORMAT_ERROR\":{\"detail\":\"XML格式错误\t\",\"reason\":\"XML格式错误\",\"reason\":\"请检查XML参数格式是否正确\"}}");


@Override @Override
public ResultData createSubsidy(MallUserInfo user, String ip, Integer amount) {
public ResultData createSubsidy(MallUserInfo user, String ip, String amountStr) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
EnumPayShare isShare = EnumPayShare.NO; EnumPayShare isShare = EnumPayShare.NO;
Date curDate = new Date(); Date curDate = new Date();
@@ -93,7 +94,8 @@ public class WxSubsidyServiceImpl implements WxSubsidyService {
isShare = EnumPayShare.YES; isShare = EnumPayShare.YES;
} }
// 3. 补贴订单 // 3. 补贴订单
Integer totalFee = amount * 100; // 元->分
BigDecimal amountY = new BigDecimal(amountStr);
int totalFee = amountY.multiply(new BigDecimal(100)).intValue(); // 元->分


Long id = idWorker.nextId(); Long id = idWorker.nextId();
String payOrderNo = String.valueOf(id); String payOrderNo = String.valueOf(id);
@@ -104,7 +106,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService {
record.setCreateTime(curDate); record.setCreateTime(curDate);
record.setUpdateTime(curDate); record.setUpdateTime(curDate);
record.setOrderNo(payOrderNo); record.setOrderNo(payOrderNo);
record.setBody("商场补贴-"+amount + "元");
record.setBody("商场补贴-"+amountStr + "元");
record.setIp(ip); record.setIp(ip);
record.setStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); record.setStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode());
record.setPayTimeStart(curDate); record.setPayTimeStart(curDate);


正在加载...
取消
保存