diff --git a/hai-bweb/src/main/java/com/bweb/controller/BsMsgController.java b/hai-bweb/src/main/java/com/bweb/controller/BsMsgController.java index b4cc1734..c192555a 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/BsMsgController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/BsMsgController.java @@ -49,7 +49,6 @@ public class BsMsgController { public ResponseData getMsgByList( @RequestParam(value = "type", required = false) Integer type, @RequestParam(value = "jumpType", required = false) Integer jumpType, - @RequestParam(value = "msgType", required = false) Integer msgType, @RequestParam(value = "title", required = false) String title, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request @@ -63,7 +62,7 @@ public class BsMsgController { map.put("type", type); map.put("jumpType", jumpType); - map.put("msgType", msgType); + map.put("msgType", 2); map.put("title", title); map.put("companyId" , userInfoModel.getBsCompany().getId()); diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java index 250737e3..ecf091fd 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java @@ -155,8 +155,6 @@ public class OrderServiceImpl implements OrderService { child.setMemName(order.getMemName()); child.setMemPhone(order.getMemPhone()); - /*********** 组装肯德基,星巴克,第三方会员充值 话费 请求数据************/ - JSONObject object = thirdProductConfig.assembleOrder(order , child); // 购买卡券 if (child.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) { @@ -189,6 +187,10 @@ public class OrderServiceImpl implements OrderService { // 肯德基 } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) { + + /*********** 组装肯德基,星巴克,第三方会员充值 话费 请求数据************/ + JSONObject object = thirdProductConfig.assembleOrder(order , child); + order.setProductType(OrderProductType.PRODUCT_TYPE2.getNumber()); // 创建肯德基订单业务 List couponOrderList = orderCreateHandleService.thirdPartyOrder(order , object); @@ -206,6 +208,9 @@ public class OrderServiceImpl implements OrderService { // 话费充值 } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE6.getNumber())) { + /*********** 组装肯德基,星巴克,第三方会员充值 话费 请求数据************/ + JSONObject object = thirdProductConfig.assembleOrder(order , child); + HighChildOrder childOrder = orderCreateHandleService.mobileRecharge(order , object); childOrderList.add(childOrder); order.setTitle(childOrder.getGoodsName()); @@ -227,6 +232,10 @@ public class OrderServiceImpl implements OrderService { // 星巴克 } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE9.getNumber())) { + + /*********** 组装肯德基,星巴克,第三方会员充值 话费 请求数据************/ + JSONObject object = thirdProductConfig.assembleOrder(order , child); + order.setProductType(OrderProductType.PRODUCT_TYPE1.getNumber()); // 创建星巴克订单业务 List couponOrderList = orderCreateHandleService.thirdPartyOrder(order, object); @@ -240,6 +249,10 @@ public class OrderServiceImpl implements OrderService { } // 第三方充值 } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE10.getNumber())) { + + /*********** 组装肯德基,星巴克,第三方会员充值 话费 请求数据************/ + JSONObject object = thirdProductConfig.assembleOrder(order , child); + order.setProductType(OrderProductType.PRODUCT_TYPE3.getNumber()); // 创建第三方充值订单业务 List couponOrderList = orderCreateHandleService.thirdPartyOrder(order , object);