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

hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java

@@ -399,10 +399,6 @@ public class EtcCustomerController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到相关内容！");
             }
 
-            if (etcCarMsg.getVehStatus() == 11 || etcCarMsg.getVehStatus() == 12 || etcCarMsg.getVehStatus() == 13 || etcCarMsg.getVehStatus() == 15 || etcCarMsg.getVehStatus() == 20) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "状态错误！");
-            }
-
             etcCarMsgService.deleteEtcCar(id);
             return ResponseMsgUtil.success("删除成功！");
 
@@ -424,8 +420,7 @@ public class EtcCustomerController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到相关内容！");
             }
 
-            etcCustMsg.setStatus(0);
+            etcCustMsgService.deleteEtcCust(id);
-            etcCustMsgService.editEtcCust(etcCustMsg);
 
             return ResponseMsgUtil.success("删除成功！");
 

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

@@ -373,20 +373,7 @@ public class OrderPayController {
                     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);
+                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
-//
-                    // 查询支付配置
-                    HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type2);
-                    if (gasChannelConfig == null) {
-                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
-                    }
-
-                    payPlatformType =  gasChannelConfig.getPayPlatformType();
-                    payPlatformKey =  gasChannelConfig.getPayPlatformMerKey();
-                    payPlatformMerNo =  gasChannelConfig.getPayPlatformMerNo();
-
-                    weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo());
-                    profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N";
                 } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE15.getNumber())) {
                     // 查询支付配置
                     HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type7);
@@ -418,7 +405,6 @@ public class OrderPayController {
                 }
             }
 
-
             // weChatPayReqInfo.setOpenid(openId);
             weChatPayReqInfo.setSub_openid(body.getString("openId"));
             weChatPayReqInfo.setNonce_str(nonce_str);                                           // 随机字符串
@@ -435,8 +421,6 @@ public class OrderPayController {
 
             SortedMap<Object, Object> sortedMap;
 
-            System.out.println("-----------------------" + payPlatformType);
-
             if (payPlatformType == 2) {
                 objectGas.put("outTradeNo" , order.getOrderNo());
                 objectGas.put("transType" , "JSAPI");

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

@@ -480,7 +480,6 @@ public class WxUtils {
 
         Set<String> keySet = data.keySet();
         String[] keyArray = keySet.toArray(new String[keySet.size()]);
-//        Arrays.sort(keyArray);
         StringBuilder sb = new StringBuilder();
         for (String k : keyArray) {
             if (k.equals(WXPayConstants.FIELD_SIGN)) {

hai-service/src/main/java/com/hai/etc/EtcCustMsgService.java

@@ -37,6 +37,8 @@ public interface EtcCustMsgService {
 
     void editEtcCust(EtcCustMsg etcCustMsg) throws Exception;
 
+    void deleteEtcCust(Long id) throws Exception;
+
     /**
      * @Author Sum1Dream
      * @Name getCustInfoList

hai-service/src/main/java/com/hai/etc/impl/EtcCustMsgServiceImpl.java

@@ -47,6 +47,11 @@ public class EtcCustMsgServiceImpl implements EtcCustMsgService {
         etcCustMsgMapper.updateByPrimaryKey(etcCustMsg);
     }
 
+    @Override
+    public void deleteEtcCust(Long id) throws Exception {
+        etcCustMsgMapper.deleteByPrimaryKey(id);
+    }
+
     @Override
     public List<EtcCustMsg> getEtcCustList(Map<String, Object> map) {