变更

hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java

@@ -356,7 +356,6 @@ public class HighThirdPartyController {
     public ResponseData getThirdOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
         try {
 
-
             HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
 
             JSONObject object;
@@ -365,7 +364,6 @@ public class HighThirdPartyController {
             // 实际支付金额
             BigDecimal orderPayPrice = new BigDecimal(0);
 
-
             if (order.getHighChildOrderList().get(0).getGoodsType() == 4) {
 
                 object = QianZhuConfig.getKfcOrderByOrderNo(order.getHighChildOrderList().get(0).getChannelOrderNo());

hai-service/src/main/java/com/hai/dao/SecSinopecConfigMapper.java

@@ -102,4 +102,4 @@ public interface SecSinopecConfigMapper extends SecSinopecConfigMapperExt {
         "where id = #{id,jdbcType=INTEGER}"
     })
     int updateByPrimaryKey(SecSinopecConfig record);
-}
+}

hai-service/src/main/java/com/hai/mobile/service/MobileHandleService.java

@@ -1,14 +0,0 @@
-package com.hai.mobile.service;
-
-/**
- * @serviceName MobileHandleService.java
- * @author Sum1Dream
- * @version 1.0.0
- * @Description // 话费业务处理
- * @createTime 11:09 2023/5/17
- **/
-public interface MobileHandleService {
-
-
-
-}

hai-service/src/main/java/com/hai/mobile/service/impl/MobileHandleServiceImpl.java

@@ -1,6 +0,0 @@
-package com.hai.mobile.service.impl;
-
-import com.hai.mobile.service.MobileHandleService;
-
-public class MobileHandleServiceImpl implements MobileHandleService {
-}

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

@@ -16,6 +16,7 @@ public class ApiIpAddressServiceImpl implements ApiIpAddressService {
     @Resource
     private ApiIpAddressMapper apiIpAddressMapper;
 
+
     @Override
     public void insertApiIpAddress(ApiIpAddress apiIpAddress) {
         apiIpAddressMapper.insert(apiIpAddress);

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

@@ -9,7 +9,6 @@ import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.BaiduUtils;
 import com.hai.common.utils.DateUtil;
-import com.hai.common.utils.HttpsUtils;
 import com.hai.common.utils.RequestUtils;
 import com.hai.dao.HighGoldRecMapper;
 import com.hai.dao.HighUserLoginLogMapper;
@@ -49,9 +48,6 @@ public class HighUserServiceImpl implements HighUserService {
     @Resource
     private HighUserCouponService highUserCouponService;
 
-    @Resource
-    private OutRechargeOrderService outRechargeOrderService;
-
     @Resource
     private HighUserCardService highUserCardService;
 
@@ -112,6 +108,7 @@ public class HighUserServiceImpl implements HighUserService {
             user.setInfoCompleteStatus(1); // 用户信息完整状态  0：完整  1：需要填写用户信息 2：需要填写手机号
             user.setOpenId(MapUtils.getString(other, "openId"));
             user.setUnionId(MapUtils.getString(other, "unionId"));
+            user.setOpenIdH5(MapUtils.getString(other, "openIdH5"));
             user.setUnionUnionId(MapUtils.getString(other, "unionUnionId"));
             highUserMapper.insert(user);
 
@@ -128,6 +125,7 @@ public class HighUserServiceImpl implements HighUserService {
                 distributionUserRelService.insertDistributionRebate(user.getId(),  popularizeUserId, region.getRegionId().toString());
             }
         }
+        user.setOpenIdH5(MapUtils.getString(other, "openIdH5"));
         loginLog.setUserId(user.getId());
         userLoginLogMapper.insert(loginLog);
 

hai-service/src/main/resources/dev/commonConfig.properties

@@ -127,3 +127,5 @@ logisticsAppSecret=5ba7552b194e4147b7db1c34143e3317
 payPostUrl=https://gratia-pay.dctpay.com/crest/
 filesystem=https://hsgcs.dctpay.com/filesystem/
 #payPostUrl=http://localhost:9601/crest/
+
+#