Merge branch 'develop' of http://git.mmcuav.cn/iuav/cms into develop

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

@@ -22,4 +22,6 @@ public interface UserSubInfoDao {
     void removeUserSubInfo(String openId);
 
     void updateUserSubInfo(UserSubInfoDO subInfo);
+
+    String getUserOpenidByUnionId(String unionId);
 }

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

@@ -17,6 +17,7 @@ import com.mmc.iuav.user.dao.userpoints.UserPointsDao;
 import com.mmc.iuav.user.dao.userpoints.UserPointsDetailsDao;
 import com.mmc.iuav.user.entity.CompanyInfoDO;
 import com.mmc.iuav.user.entity.UserAccountDO;
+import com.mmc.iuav.user.entity.UserSubInfoDO;
 import com.mmc.iuav.user.entity.dronepilot.*;
 import com.mmc.iuav.user.entity.userpoints.UserPointsDO;
 import com.mmc.iuav.user.entity.userpoints.UserPointsDetails;
@@ -314,7 +315,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             WxMsgVO ws = new WxMsgVO();
             String unionId = userAccountDO.getUnionId();
             // 查询对应的openId(touser)
-            String touser = userSubInfoDao.getUserSubInfoByUnionId(unionId).getOpenId();
+            String touser = userSubInfoDao.getUserOpenidByUnionId(unionId);
             JSONObject jsonObject = spellMsg("飞手执照及能力认证","审核通过");
             ws.setTouser(touser);
             ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");

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

@@ -255,8 +255,8 @@ public class WxServiceImpl implements WxService {
         try {
             accessToken = this.getSubStableAccessToken();
             if (StringUtils.isBlank(ws.getTouser())) {
-                String unionId = userServiceDao.getUserAccountById(ws.getUserAccountId()).getUnionId();
-                String touser = userSubInfoDao.getUserSubInfoByUnionId(unionId).getOpenId();
+                String unionId = userServiceDao.getUserAccountById(ws.getUserAccountId()).getUnionId();// 查询对应的openId(touser)
+                String touser = userSubInfoDao.getUserOpenidByUnionId(unionId);
                 ws.setTouser(touser);
             }
             String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken;

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

@@ -41,8 +41,13 @@
 		from user_sub_info u
 		where u.open_id = #{openId} and is_deleted = 0
 	</select>
+	<select id="getUserOpenidByUnionId" resultType="java.lang.String">
+		select usi.open_id
+		from  user_sub_info usi
+		where usi.union_id = #{unionId} and usi.is_deleted=0
+	</select>
 
-    <insert id="insertUserSubInfo" useGeneratedKeys="true"
+	<insert id="insertUserSubInfo" useGeneratedKeys="true"
             keyProperty="id" parameterType="com.mmc.iuav.user.entity.UserSubInfoDO">
 		insert into user_sub_info
 		(

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: 3ddf3987db40cb422ed301bc69f812b36fa7c298
+  newTag: 894d7be623eced6509af2c43ce3cee0eb3485a5b