Просмотр исходного кода

refactor(header): 重构请求头获取逻辑

- 移除不必要的 provider_id 设置
- 将 provider_id 替换为 provider-id- 统一获取请求头中的 provider-id
- 删除了 MemberAuthUtils 和 MercAuthUtils 中的冗余代码
hechunping 1 неделя назад
Родитель
Сommit
2ba78ec1a4

+ 2 - 4
src/main/java/com/xynet/marketing/controller/inner/InnerCouponController.java

@@ -35,9 +35,8 @@ public class InnerCouponController {
      */
     @PostMapping("registerSend")
     public R registerSend(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
-        headers.put("provider_id", "1");
         MercCouponFactory mercCouponFactory = FactoryUtils.getService(MercCouponFactory.class, "merc_coupon_base");
-        Integer mercId = mercService.thirdMercIdToMercId(headers.get("provider_id"), param.getString("thirdMercId"));
+        Integer mercId = mercService.thirdMercIdToMercId(headers.get("provider-id"), param.getString("thirdMercId"));
         param.put("mercId", mercId);
         return R.ok(mercCouponFactory.registerSend(param));
     }
@@ -51,9 +50,8 @@ public class InnerCouponController {
      */
     @PostMapping("orderSend")
     public R orderSend(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
-        headers.put("provider_id", "1");
         MercCouponFactory mercCouponFactory = FactoryUtils.getService(MercCouponFactory.class, "merc_coupon_base");
-        Integer mercId = mercService.thirdMercIdToMercId(headers.get("provider_id"), param.getString("thirdMercId"));
+        Integer mercId = mercService.thirdMercIdToMercId(headers.get("provider-id"), param.getString("thirdMercId"));
         param.put("mercId", mercId);
         return R.ok(mercCouponFactory.orderSend(param));
     }

+ 1 - 2
src/main/java/com/xynet/marketing/controller/inner/InnerEnquiryController.java

@@ -30,10 +30,9 @@ public class InnerEnquiryController {
 
     @PostMapping("goodsListPrice")
     public R goodsListPrice(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
-        headers.put("provider_id", "1");
         param.put("mercId",
                 mercService.thirdMercIdToMercId(
-                        headers.get("provider_id"),
+                        headers.get("provider-id"),
                         param.getString("thirdMercId"))
         );
         JMap<String, Object> result = enquiryService.goodsListPrice(param);

+ 1 - 2
src/main/java/com/xynet/marketing/controller/member/EnquiryController.java

@@ -31,12 +31,11 @@ public class EnquiryController {
 
     @PostMapping("goodsListPrice")
     public R goodsListPrice(@RequestBody JHashMap<String, Object> param, @RequestHeader Map<String, String> headers) {
-        headers.put("provider_id", "1");
         String thirdMemberId = MemberAuthUtils.getThirdMemberId(headers);
         param.put("thirdMemberId", thirdMemberId);
         param.put("mercId",
                 mercService.thirdMercIdToMercId(
-                        headers.get("provider_id"),
+                        headers.get("provider-id"),
                         param.getString("thirdMercId"))
         );
         JMap<String, Object> result = enquiryService.goodsListPrice(param);

+ 1 - 1
src/main/java/com/xynet/marketing/controller/member/MemberCouponController.java

@@ -66,7 +66,7 @@ public class MemberCouponController {
         param.put("thirdMemberId", thirdMemberId);
         param.put("mercId",
                 mercService.thirdMercIdToMercId(
-                        headers.get("provider_id"),
+                        headers.get("provider-id"),
                         param.getString("thirdMercId"))
         );
         return R.ok(mercCouponService.autoSend(param));

+ 1 - 2
src/main/java/com/xynet/marketing/utils/MemberAuthUtils.java

@@ -18,8 +18,7 @@ public class MemberAuthUtils {
     public static String getThirdMemberId(Map<String, String> headers) {
         //获取token
         String token = headers.get("token");
-        headers.put("provider_id", "1");
-        String providerId = headers.get("provider_id");
+        String providerId = headers.get("provider-id");
         RedisService<UserSessionModel> redisService = SpringBeanUtils.getBean(RedisService.class);
         if (!Emptys.check(token)) {
             throw new BusinessException("token不能为空");

+ 1 - 2
src/main/java/com/xynet/marketing/utils/MercAuthUtils.java

@@ -19,8 +19,7 @@ public class MercAuthUtils {
     public static Integer getMercId(Map<String, String> headers) {
         //获取token
         String token = headers.get("token");
-        headers.put("provider_id", "1");
-        String providerId = headers.get("provider_id");
+        String providerId = headers.get("provider-id");
         RedisService<UserSessionModel> redisService = SpringBeanUtils.getBean(RedisService.class);
         if (!Emptys.check(token)) {
             throw new BusinessException("token不能为空");