Merge branch 'new-dev' into 2.0-dev

# Conflicts:
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java

hai-bweb/src/main/java/com/bweb/config/AuthConfig.java

@@ -98,6 +98,7 @@ public class AuthConfig implements WebMvcConfigurer {
 	      .excludePathPatterns("/highGoldRec/*")
 	      .excludePathPatterns("/openApi/*")
 	      .excludePathPatterns("/test/*")
+	      .excludePathPatterns("/apiProduct/*")
 	      ;
 	  }
 

hai-bweb/src/main/java/com/bweb/controller/ApiProductController.java

@@ -359,7 +359,7 @@ public class ApiProductController {
                     JSONObject goodsOption = jsonArray.getJSONObject(j);
                     JSONArray childArray = goodsOption.getJSONArray("child");
                     for (int t = 0; t < childArray.size(); t++) {
-                        JSONObject child = childArray.getJSONObject(j);
+                        JSONObject child = childArray.getJSONObject(t);
                         JSONObject data = new JSONObject();
                         data.put("title" , jsonObject.getString("sort_title") + goodsOption.getString("name"));
                         data.put("goodsId" ,  child.getString("goods_id"));

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

@@ -349,7 +349,7 @@ public class OrderPayController {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1665668540);
 
                 } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE9.getNumber())) {
-                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
+                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1667177808);
 
                 } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE12.getNumber())) {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);

hai-service/src/main/java/com/hai/common/utils/WxUtils.java

@@ -3,6 +3,7 @@ package com.hai.common.utils;
 import com.google.common.collect.Maps;
 import com.hai.common.pay.util.sdk.WXPayConstants;
 import com.hai.common.pay.util.sdk.WXPayXmlUtil;
+import com.hai.config.CommonSysConst;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.naming.NoNameCoder;
 import com.thoughtworks.xstream.io.xml.XppDriver;
@@ -535,6 +536,7 @@ public class WxUtils {
     }
 
     public static String generateSignApi(final Map<String, Object> data, String key, WXPayConstants.SignType signType , Boolean isUpperCase) throws Exception {
+
         Set<String> keySet = data.keySet();
         String[] keyArray = keySet.toArray(new String[keySet.size()]);
         Arrays.sort(keyArray);
@@ -543,9 +545,6 @@ public class WxUtils {
             if (k.equals(WXPayConstants.FIELD_SIGN) || k.equals("app_secret")) {
                 continue;
             }
-            if (k.equals("notify_url")) {
-                k = URLEncoder.encode(k, "UTF-8");
-            }
             if (data.get(k) != null) // 参数值为空，则不参与签名
             {
                 sb.append(k).append("=").append(data.get(k)).append("&");

hai-service/src/main/java/com/hai/config/RechargeConfig.java

@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.net.URLEncoder;
 import java.util.*;
 
 /**
@@ -264,20 +265,33 @@ public class RechargeConfig {
     * @Param object  
      * @return com.alibaba.fastjson.JSONObject
     */
-    public static JSONObject rechargeOrderByJn(JSONObject object) throws  Exception{
+    public static JSONObject rechargeOrderByJn(JSONObject object){
+        try {
         log.info("发起简牛下单表");
         Map<String,Object> paramMap = new HashMap<>();
         paramMap.put("appid" , CommonSysConst.getSysConfig().getJnApiKey());
-        paramMap.put("account" , object.getBigDecimal("price"));
+        paramMap.put("account" , object.getString("phone"));
-        paramMap.put("goods_id" , object.getBigDecimal("goodsId"));
+        paramMap.put("option_id" , object.getString("option_id"));
-        paramMap.put("order_no" , object.getBigDecimal("orderNo"));
+        paramMap.put("order_no" , object.getString("orderNo"));
-        paramMap.put("option_id" , object.getBigDecimal("optionId"));
+        paramMap.put("goods_id" , "136");
-        paramMap.put("notify_url" , CommonSysConst.getSysConfig().getJnNotifyUrl());
+        paramMap.put("notify_url" , URLEncoder.encode(CommonSysConst.getSysConfig().getJnNotifyUrl(), "UTF-8"));
-        paramMap.put("sign", WxUtils.generateSignApi(paramMap , CommonSysConst.getSysConfig().getJnAppSecret() , WXPayConstants.SignType.MD5 , false));
+
+        Map<String,Object> paramMaps = new HashMap<>();
+        paramMaps.put("appid" , CommonSysConst.getSysConfig().getJnApiKey());
+        paramMaps.put("account" , object.getString("phone"));
+        paramMaps.put("option_id" , object.getString("option_id"));
+        paramMaps.put("order_no" , object.getString("orderNo"));
+        paramMaps.put("goods_id" , "136");
+        paramMaps.put("notify_url" , CommonSysConst.getSysConfig().getJnNotifyUrl());
+
+        paramMaps.put("sign", WxUtils.generateSignApi(paramMap , CommonSysConst.getSysConfig().getJnAppSecret() , WXPayConstants.SignType.MD5 , false));
         log.info("发起简牛下单-请求参数: " + JSON.toJSONString(paramMap));
-        JSONObject jsonObject =  HttpsUtils.doPost(CommonSysConst.getSysConfig().getJnPostUrl()+ "/modules/api/open/order-create", paramMap , new HashMap<>());
+        JSONObject jsonObject =  HttpsUtils.doPost(CommonSysConst.getSysConfig().getJnPostUrl()+ "/modules/api/open/order-create", paramMaps , new HashMap<>());
         log.info("发起简牛下单-响应参数: " + jsonObject.toJSONString());
         return jsonObject;
+        }catch (Exception e) {
+            return null;
+        }
     }
 
     /**

hai-service/src/main/java/com/hai/config/WxOrderConfig.java

@@ -50,6 +50,12 @@ public class WxOrderConfig {
      */
     public static final String MCH_ID_1609882817 = "1609882817";
 
+    /**
+     * 微信支付商户号
+     * 青岛简牛网络科技有限公司
+     */
+    public static final String MCH_ID_1667177808 = "1667177808";
+
     /**
      * 微信支付商户号
      * 惠兑礼品 (重庆) 有限公司

hai-service/src/main/java/com/hai/entity/OutRechargeChildOrder.java

@@ -29,7 +29,7 @@ public class OutRechargeChildOrder implements Serializable {
     private String orderNo;
 
     /**
-     * 1:尖椒 2：龙阅 3：畅停
+     * 1:尖椒 2：龙阅 4：畅停 5：简牛
      */
     private Integer rechargePlatform;
 

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

@@ -1284,7 +1284,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
         childOrder.setGoodsId(apiCoupon.getId());
         childOrder.setGoodsName(apiCoupon.getName());
         childOrder.setGoodsSpecName(apiCoupon.getCode());
-        childOrder.setGoodsPrice(new BigDecimal(apiCoupon.getPrice()/100));
+        childOrder.setGoodsPrice(new BigDecimal(apiCoupon.getPrice()));
         childOrder.setGoodsActualPrice(createOrderChildModel.getPrice());
         childOrder.setSaleCount(createOrderChildModel.getSaleCount());
         childOrder.setGiveawayType(false);

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -636,6 +636,25 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             childOrder.setExt2("畅停请求参数" + object.toJSONString());
             childOrder.setExt3("畅停充值" + returnObject.toJSONString());
         }
+
+        // 简牛充值
+        if (object.getInteger("rechargePlatform") == 5) {
+
+            if (object.getString("code") == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+
+            object.put("orderNo", childOrder.getOrderNo());
+            object.put("option_id", object.getString("code"));
+            object.put("phone", object.getString("rechargeMobile"));
+
+
+            JSONObject returnObject = RechargeConfig.rechargeOrderByJn(object);
+            childOrder.setRechargePlatform(5);
+            childOrder.setExt1("简牛充值" + returnObject.toJSONString());
+            childOrder.setExt2("简牛请求参数" + object.toJSONString());
+            childOrder.setExt3("简牛充值" + returnObject.toJSONString());
+        }
         childOrder.setUpdateTime(new Date());
         outRechargeChildOrderService.updateOrder(childOrder);
     }
@@ -767,6 +786,27 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
                 }
             }
 
+            // 简牛
+            if (childOrder.getRechargePlatform() == 5) {
+                object.put("orderNo" , childOrder.getOrderNo());
+
+                JSONObject jsonObject = RechargeConfig.checkOrderByJn(object);
+                childOrder.setExt3("畅停查询"+ jsonObject);
+                if (jsonObject.getJSONObject("data") != null) {
+                    JSONObject  objectData= jsonObject.getJSONObject("data");
+                    // // 10充值中 20充值完成 -10 充值失败
+                    // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
+                    if (objectData.getInteger("status") == 10) {
+                        status = 0;
+                    } else if (objectData.getInteger("status") == 20) {
+                        status =  1;
+                    } else if (objectData.getInteger("status") == -10) {
+                        status = 2;
+                    }
+                }
+
+            }
+
             if (status == 1) {
                 childOrder.setStatus(101);
             }