xhxu 3 лет назад
Родитель
Сommit
e373601b82
2 измененных файлов: 10 добавлений и 10 удалений
  1. +8
    -8
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

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

@@ -253,14 +253,14 @@ public class WxOrderController extends BaseController {
data.put("pay_expire_seconds",14*60);
data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId()));

List<Map<String,String>> order_goods_info = new ArrayList<>();
for (CreateOrderCallback.Good good:createOrderCallback.getGoods()) {
Map<String,String> map_info = new HashMap<>();
map_info.put("goods_id",good.getGoodsId());
map_info.put("merchant_uid","71070743816369953633");
order_goods_info.add(map_info);
}
data.put("order_goods_info",order_goods_info);
// List<Map<String,String>> order_goods_info = new ArrayList<>();
// for (CreateOrderCallback.Good good:createOrderCallback.getGoods()) {
// Map<String,String> map_info = new HashMap<>();
// map_info.put("goods_id",good.getGoodsId());
// map_info.put("merchant_uid","71070743816369953633");
// order_goods_info.add(map_info);
// }
// data.put("order_goods_info",order_goods_info);





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

@@ -3831,8 +3831,8 @@ public class WxOrderServiceImpl implements WxOrderService {
}
}

if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) {
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF.getCode(),premsg+"已下架");
if (wxCouponChannel.getStatus() != EnumCouponChannelStatus.STATUS_THROW_IN.getCode()) {
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF.getCode(),premsg+"暂未上架");
}
if (null != wxCouponChannel.getChannelStock() && wxCouponChannel.getChannelStock() <= 0) {


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