Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/payment
-  newTag: c6f3b8e0bc347ab5c121e313dbfb28bbd8037452
+  newTag: 7743582be5ef45971d72796c1d5fdf19fef00e7e

src/main/java/com/mmc/payment/feign/UserAppApi.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -59,5 +60,5 @@ public interface UserAppApi {
     List<UserAccountSimpleDTO> feignListAppUserAccount(@ApiParam(value = "账号查询QO", required = true) @RequestBody UserAccountQO userAccountQO, @RequestHeader("token") String token);
 
     @GetMapping("/userapp/message/timeTypeById")
-    Integer timeTypeById(@RequestParam Integer typeId);
+    Integer timeTypeById(@RequestParam Integer typeId, @RequestHeader("token") String token, @RequestHeader HttpServletRequest request);
 }

src/main/java/com/mmc/payment/service/Impl/WechatPayServiceImpl.java

@@ -76,7 +76,7 @@ public class WechatPayServiceImpl implements WechatPayService {
             throw new RuntimeException("服务器内部错误！");
         }
         if(orderRequestParamsVO.getChatType() != null && orderRequestParamsVO.getOrderPort() == 7){
-            Integer integer = userAppApi.timeTypeById(orderRequestParamsVO.getChatType())   ;
+            Integer integer = userAppApi.timeTypeById(orderRequestParamsVO.getChatType(), request.getHeader("token"),request )   ;
             orderRequestParamsVO.setAmount(integer);
         }
         Config config = wxConfigUtils.createConfig();