修改
This commit is contained in:
@@ -841,9 +841,9 @@ public class PayService {
|
||||
orderInfo.setPayAmount(orderInfo.getOrderAmount());
|
||||
}
|
||||
|
||||
orderInfo.setPayType("cash");
|
||||
orderInfo.setPayType("deposit");
|
||||
orderInfo.setStatus("closed");
|
||||
orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));
|
||||
orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
|
||||
orderInfo.setMemberId(vipUserId.toString());
|
||||
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
|
||||
//更新购物车状态
|
||||
@@ -1065,7 +1065,7 @@ public class PayService {
|
||||
TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
|
||||
|
||||
|
||||
if ("1".equals(shopInfo.getIsReturn())) {
|
||||
if ("0".equals(shopInfo.getIsReturn())) {
|
||||
if (ObjectUtil.isEmpty(pwd)) {
|
||||
return Result.fail(CodeEnum.PARAM);
|
||||
}
|
||||
@@ -1156,7 +1156,7 @@ public class PayService {
|
||||
detailPo.setStatus("closed");
|
||||
|
||||
}
|
||||
BigDecimal returnAmount = it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN).multiply(new BigDecimal(map1.get(it.getId())));
|
||||
BigDecimal returnAmount = payAmount;
|
||||
detailPo.setReturnNum(map1.get(it.getId()));
|
||||
detailPos.add(detailPo);
|
||||
it.setNum(map1.get(it.getId()));
|
||||
@@ -1680,6 +1680,7 @@ public class PayService {
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(MD5Util.encrypt("123456".concat("13718478323").concat("10")));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user