Merge branch 'master' into develop

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

@@ -67,6 +67,7 @@ public class CompanyController extends BaseController {
         return companyService.getCompanyInfoByBUId(backUserAccountId);
     }
 
+
     @ApiOperation(value = "单位列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInfoVO.class)})
     @PostMapping("listCompanyPage")

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

@@ -19,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -213,4 +214,11 @@ public class PilotCertificationController extends BaseController {
     public String getPilotApplyPhone(@RequestParam Integer userAccountId){
         return certificationService.getPilotApplyPhone(userAccountId);
     }
+
+    @ApiOperation(value = "充钱")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = Integer.class)})
+    @GetMapping("/chongqian")
+    public ResultBody chongqian(@RequestParam String  name,@RequestParam BigDecimal money){
+        return certificationService.chongqian(name,money);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java

@@ -9,6 +9,7 @@ import com.mmc.iuav.user.model.qo.dronepilot.*;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -172,4 +173,8 @@ public interface PilotCertificationDao {
     Integer selectPilotTeam(Integer pilotUserId);
 
     TeamMessageDO selectPilotTeamInfo(Integer pilotUserId);
+
+    int getUserId(String name);
+
+    int chongqian(Integer userId, BigDecimal money);
 }

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

@@ -11,6 +11,7 @@ import com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO;
 import com.mmc.iuav.user.model.qo.dronepilot.*;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -68,4 +69,6 @@ public interface PilotCertificationService {
      * 通过用户id查询用户的手机号
      */
     String getPilotApplyPhone(Integer userAccountId);
+
+    ResultBody chongqian(String name, BigDecimal money);
 }

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

@@ -42,6 +42,7 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -718,6 +719,19 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         return certificationDao.getUserPhone(userAccountId);
     }
 
+    @Override
+    public ResultBody chongqian(String name, BigDecimal money) {
+        int userId = certificationDao.getUserId(name);
+        if(userId == 0) {
+            return ResultBody.error(String.format("{},充值失败", name));
+        }
+        int i = certificationDao.chongqian(userId, money);
+        if(i == 1){
+            return ResultBody.success();
+        }
+        return ResultBody.error(String.format("{},充值失败", name));
+    }
+
     public JSONObject spellMsg(String name, String result){
         JSONObject data=new JSONObject();
 

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

@@ -69,6 +69,7 @@ public class CompanyAuthServiceImpl implements CompanyAuthService {
 
     public ResultBody companyCheck(CompanyAuthVO companyAuthVO) {
         String businessRes = qccEntAuthUtil.businessLicenseCheck(companyAuthVO.getLicenseImg());
+        log.info(" 企业认证返回businessRes：{}", businessRes);
         if (businessRes == null) {
             ResultBody resultBody = ResultBody.error(ResultEnum.BUSINESS_LICENSE_CHECK_ANALYSIS_ERROR);
             return resultBody;

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

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mmc.iuav.http.HttpHelper;
 import com.mmc.iuav.http.HttpsRequestUtil;
 import com.mmc.iuav.user.constant.UserSystemConstant;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.client.methods.HttpHead;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@ import java.util.regex.Pattern;
  * @Date: 2023/5/17 13:37
  */
 @Component
+@Slf4j
 public class QccEntAuthUtil {
 
     @Autowired
@@ -104,6 +106,7 @@ public class QccEntAuthUtil {
         String bodys = "{\"image\":\""+businessLicenseUrl+"\"}";
         try {
             String response = HttpsRequestUtil.httpsRequest(url, method, headers, bodys);
+            log.info("response11111111111111: " + response);
             //获取response的body
             if(response.equals("Invalid Result - invalid business license")){
                 return null;

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -604,6 +604,14 @@
                  inner join company_member cm on ci.id = cm.company_info_id
         where pjt.pilot_user_id = #{userId} and cm.is_leader = 1
     </select>
+    <select id="getUserId" resultType="java.lang.Integer">
+        select user_account_id from real_name_auth where user_name = #{name}
+    </select>
 
+    <update id="chongqian">
+        update pay_wallet
+        set salary_amt = #{money}
+        where user_account_id = #{userId}
+    </update>
 
 </mapper>

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 08e24afd021abf8b635dc6c6edb9c5170b4bd145
+  newTag: efdef304aa5ddde9cdfecedc7fe86a9d5da6880b