Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev

hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java

@@ -133,7 +133,9 @@ public class GoodsController {
     public ResponseData getListGoodsDetailByHome(
             @RequestParam(value = "goodsTypeId", required = false) String goodsTypeId,
             @RequestParam(value = "title", required = false) String title,
-            @RequestParam(value = "companyId", required = false) Long companyId
+            @RequestParam(value = "companyId", required = false) Long companyId,
+            @RequestParam(name = "pageNum", required = true) Integer pageNum,
+            @RequestParam(name = "pageSize", required = true) Integer pageSize
     ) {
         try {
 
@@ -184,7 +186,8 @@ public class GoodsController {
 
                 }
             }
-            return ResponseMsgUtil.success(goodsModels);
+
+            return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum, goodsModels.size(), pageSize, new PageInfo<>(goodsModels)));
 
 
         } catch (Exception e) {

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -398,6 +398,8 @@ public class OrderPayController {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
                 } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE20.getNumber())) {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
+                } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE21.getNumber())) {
+                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
                 }  else {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1609882817);
                 }

hai-service/src/main/java/com/hai/openApi/service/impl/ApiMchProductServiceImpl.java

@@ -141,6 +141,9 @@ public class ApiMchProductServiceImpl implements ApiMchProductService {
         if (MapUtils.getLong(map, "merchantId") != null) {
             criteria.andMerchantIdEqualTo(MapUtils.getLong(map, "merchantId"));
         }
+        if (MapUtils.getInteger(map, "status") != null) {
+            criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
+        }
 
         List<ApiMchProduct> list = apiMchProductMapper.selectByExample(example);
 

hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java

@@ -734,28 +734,28 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
             for (Object o : array) {
                 JSONObject object1 = (JSONObject) o;
                 Map<String, Object> contentMap = new LinkedHashMap<>();
-                if (!object1.getString("productId").equals("")) {
+                if (object1.getString("productId") != null && !object1.getString("productId").equals("")) {
                     contentMap.put("productId", object1.getString("productId"));
                 }
-                if (!object1.getString("cupSize").equals("")) {
+                if (object1.getString("cupSize") != null && !object1.getString("cupSize").equals("")) {
                     contentMap.put("cupSize", object1.getString("cupSize"));
                 }
-                if (!object1.getString("temperature").equals("")) {
+                if (object1.getString("temperature") != null && !object1.getString("temperature").equals("")) {
                     contentMap.put("temperature", object1.getString("temperature"));
                 }
-                if (!object1.getString("cream").equals("")) {
+                if (object1.getString("cream") != null && !object1.getString("cream").equals("")) {
                     contentMap.put("cream", object1.getString("cream"));
                 }
-                if (!object1.getString("espresso").equals("")) {
+                if (object1.getString("espresso") != null && !object1.getString("espresso").equals("")) {
                     contentMap.put("espresso", object1.getString("espresso"));
                 }
-                if (!object1.getString("milk").equals("")) {
+                if (object1.getString("milk") != null && !object1.getString("milk").equals("")) {
                     contentMap.put("milk", object1.getString("milk"));
                 }
-                if (!object1.getString("milkBubble").equals("")) {
+                if (object1.getString("milkBubble") != null && !object1.getString("milkBubble").equals("")) {
                     contentMap.put("milkBubble", object1.getString("milkBubble"));
                 }
-                if (!"".equals(object1.getString("num"))) {
+                if (object1.getString("num") != null && !"".equals(object1.getString("num"))) {
                     contentMap.put("num", object1.getString("num"));
                 }
                 List.add(JSON.toJSONString(contentMap));

v1/src/main/java/com/v1/controller/business/MemberProductsController.java

@@ -112,6 +112,7 @@ public class MemberProductsController {
 
             Map<String, Object> mapProduct = new HashMap<>();
             mapProduct.put("mchId" , object.getString("merchId"));
+            mapProduct.put("status" , 101);
             mapProduct.put("productType" , OrderProductType.PRODUCT_TYPE3.getNumber());
 
             ApiMchProduct apiMchProducts = apiMchProductService.findByMap(mapProduct);