Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java

@@ -160,7 +160,7 @@ public class MessageController  extends BaseController{
     @ApiOperation(value = "根据类型ID返回聊天时长选购类型")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("/timeTypeById")
-    public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true)  Integer typeId){
-        return messageService.timeTypeById(typeId);
+    public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true)  Integer typeId,HttpServletRequest request){
+        return messageService.timeTypeById(typeId,this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/MessageService.java

@@ -93,5 +93,5 @@ public interface MessageService {
 
     ResultBody insertTimeType(MessageTimeVO messageTimeVO);
 
-    Integer timeTypeById(Integer id);
+    Integer timeTypeById(Integer id,Integer userId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java

@@ -384,7 +384,12 @@ public class MessageServiceImpl implements MessageService {
     }
 
     @Override
-    public Integer timeTypeById(Integer id) {
+    public Integer timeTypeById(Integer id,Integer userId) {
+
+        boolean isPilot = pilotCertificationDao.pilotAuditStatus(userId)==1;
+        if(isPilot) {
+            id = 4;
+        }
         MessageTimeVO messageTimeVO1 = messageDao.selectUserMessageTimeType(id);
         BigDecimal money = messageTimeVO1.getMoney();
         BigDecimal amountInFen = money.multiply(new BigDecimal("100")).setScale(0, RoundingMode.DOWN);

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: fec1d46ffa94e111a1e627fad1a9b43df02d2c8d
+  newTag: 47715b5fd3aa9a3b895f9b0e926e9e70464210c8