提交 09a6fa5b authored 作者: zhengfg's avatar zhengfg

修改bug

上级 ba908e52
...@@ -734,9 +734,12 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -734,9 +734,12 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
* @param tbCfOrder * @param tbCfOrder
*/ */
private void countRealityPay(TbCfOrderVo tbCfOrder,String iss_coupon_id) { private void countRealityPay(TbCfOrderVo tbCfOrder,String iss_coupon_id) {
TbCfIssueCouponEntity coupon = tbCfIssueCouponService.queryObject(iss_coupon_id); if(iss_coupon_id!=null){
TbCfCouponEntity couponEntity = tbCfOrderDao.queryCouponPrice(iss_coupon_id);
tbCfOrder.setCouponPrice(couponEntity.getDeductAmount()); TbCfIssueCouponEntity coupon = tbCfIssueCouponService.queryObject(iss_coupon_id);
TbCfCouponEntity couponEntity = tbCfOrderDao.queryCouponPrice(iss_coupon_id);
tbCfOrder.setCouponPrice(couponEntity.getDeductAmount());
}
BigDecimal couponPrice = tbCfOrder.getCouponPrice(); BigDecimal couponPrice = tbCfOrder.getCouponPrice();
//实际需要支付款项 //实际需要支付款项
if (couponPrice != null) { if (couponPrice != null) {
......
...@@ -180,7 +180,7 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService { ...@@ -180,7 +180,7 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
String issuseCoupon_id = IdUtil.createIdbyUUID(); String issuseCoupon_id = IdUtil.createIdbyUUID();
//把上面获取到的值,赋值到实体类中 //把上面获取到的值,赋值到实体类中
issue.setCouponId(coupon_id); issue.setCouponId(coupon_id);
issue.setCouponIssuetableId(issuseCoupon_id); issue.setIssueId(issuseCoupon_id);
issue.setCreateTime(date); issue.setCreateTime(date);
issue.setUserId(userid); issue.setUserId(userid);
issue.setNick(nick); issue.setNick(nick);
......
...@@ -458,7 +458,7 @@ public class ZionApplicationTests { ...@@ -458,7 +458,7 @@ public class ZionApplicationTests {
String issuseCoupon_id = IdUtil.createIdbyUUID(); String issuseCoupon_id = IdUtil.createIdbyUUID();
//把上面获取到的值,赋值到实体类中 //把上面获取到的值,赋值到实体类中
issue.setCouponId("1087f4a682354843b145d36c27d2d902"); issue.setCouponId("1087f4a682354843b145d36c27d2d902");
issue.setCouponIssuetableId("5308312b76cd4819b7d94f01dea12ab8"); issue.setIssueId("5308312b76cd4819b7d94f01dea12ab8");
issue.setCreateTime(new Date().toString()); issue.setCreateTime(new Date().toString());
issue.setUserId("5308312b76cd4819b7d94f01dea12ab8"); issue.setUserId("5308312b76cd4819b7d94f01dea12ab8");
issue.setNick("avatar"); issue.setNick("avatar");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论