|
|
@@ -1136,7 +1136,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
String out_trade_no = DateUtils.getDateOrderSn();
|
|
|
BigDecimal totalPrice = new BigDecimal(0);
|
|
|
BigDecimal payPrice = new BigDecimal(0);
|
|
|
- String body = "中正祥粤云-";
|
|
|
+ String body = "中正云-";
|
|
|
List<OrderGoods> freeList = new ArrayList<>();
|
|
|
//生成订单
|
|
|
for (OrderGoodsAddBo g : goodsList) {
|
|
|
@@ -1152,7 +1152,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
|
|
|
}
|
|
|
}
|
|
|
- body = "中正祥粤云-" + goods.getGoodsName();
|
|
|
+ body = "中正云-" + goods.getGoodsName();
|
|
|
OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
|
|
|
orderGoods.setOrderSn(out_trade_no);
|
|
|
orderGoods.setGoodsYear(goods.getYear().toString());
|
|
|
@@ -1556,7 +1556,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
String out_trade_no = DateUtils.getDateOrderSn();
|
|
|
BigDecimal totalPrice = new BigDecimal(0);
|
|
|
BigDecimal payPrice = new BigDecimal(0);
|
|
|
- String body = "中正祥粤云-";
|
|
|
+ String body = "中正云-";
|
|
|
List<OrderGoods> freeList = new ArrayList<>();
|
|
|
//生成订单
|
|
|
for (OrderGoodsAddBo g : goodsList) {
|
|
|
@@ -1572,7 +1572,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
|
|
|
}
|
|
|
}
|
|
|
- body = "中正祥粤云-" + goods.getGoodsName();
|
|
|
+ body = "中正云-" + goods.getGoodsName();
|
|
|
OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
|
|
|
orderGoods.setOrderSn(out_trade_no);
|
|
|
if (g.getGoodsInputData() != null) {
|
|
|
@@ -1763,7 +1763,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
String out_trade_no = DateUtils.getDateOrderSn();
|
|
|
BigDecimal totalPrice = new BigDecimal(0);
|
|
|
BigDecimal payPrice = new BigDecimal(0);
|
|
|
- String body = "中正祥粤云-";
|
|
|
+ String body = "中正云-";
|
|
|
List<OrderGoods> freeList = new ArrayList<>();
|
|
|
//生成订单
|
|
|
for (OrderGoodsAddBo g : goodsList) {
|
|
|
@@ -1779,7 +1779,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
|
|
|
}
|
|
|
}
|
|
|
- body = "中正祥粤云-" + goods.getGoodsName();
|
|
|
+ body = "中正云-" + goods.getGoodsName();
|
|
|
OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
|
|
|
orderGoods.setOrderSn(out_trade_no);
|
|
|
if (g.getGoodsInputData() != null) {
|
|
|
@@ -1937,7 +1937,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
if (goods.getGoodsStatus() != 1) {
|
|
|
throw new CustomException(goods.getGoodsName() + "商品已下架，请重新选择商品下单");
|
|
|
}
|
|
|
- body = "中正祥粤云-" + goods.getGoodsName();
|
|
|
+ body = "中正云-" + goods.getGoodsName();
|
|
|
break;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -1973,7 +1973,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
if (goods.getGoodsStatus() != 1) {
|
|
|
throw new CustomException(goods.getGoodsName() + "商品已下架，请重新选择商品下单");
|
|
|
}
|
|
|
- body = "中正祥粤云-" + goods.getGoodsName();
|
|
|
+ body = "中正云-" + goods.getGoodsName();
|
|
|
break;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -2107,7 +2107,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
if (goods.getGoodsStatus() != 1) {
|
|
|
throw new CustomException(goods.getGoodsName() + "商品已下架，请重新选择商品下单");
|
|
|
}
|
|
|
- body = "中正祥粤云-" + goods.getGoodsName();
|
|
|
+ body = "中正云-" + goods.getGoodsName();
|
|
|
break;
|
|
|
}
|
|
|
} else {
|
he2802