Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java

@@ -54,6 +54,8 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper<DgLoanCommitte
                                             @Param("auditStatus") Integer auditStatus, @Param("operatingStatus") Integer operatingStatus,
                                             @Param("auditOpinion") String auditOpinion);
 
+    Boolean updateGuaranteeLetterAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("auditStatus") Integer auditStatus);
+
     Integer getAuditStatus(Integer id);
 
     Boolean updateLoanCommitteeConsiderUserIdById(@Param("id") Integer id, @Param("userId") Integer userId);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java

@@ -22,8 +22,7 @@ import com.daqing.financial.guarantee.util.DateUtils;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import com.daqing.framework.domain.guarantee.DgAuditProcess;
 import com.daqing.framework.domain.guarantee.GuaranteeCode;
-import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO;
+import com.daqing.framework.domain.guarantee.po.*;
-import com.daqing.framework.domain.guarantee.po.StatusPO;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
@@ -42,8 +41,6 @@ import com.google.common.collect.Maps;
 import org.springframework.stereotype.Service;
 
 
-import com.daqing.framework.domain.guarantee.po.DgTeamEfficiencyPO;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java

@@ -134,6 +134,10 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                         result1 = this.getBaseMapper().updateGuaranteeLetterAssignUser(
                                 this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
                                 PromptSuccess.FG_JL_ID, StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND,"");
+                        // 此时有可能是多级驳回至贷审会,所以要以业务id更新担保函审核状态
+                        this.getBaseMapper().updateGuaranteeLetterAuditStatusByBusinessId(
+                                this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
+                                StatusCode.SP_IN_REVIEW);
                     } else {
                         // 当前贷审会的操作状态不为驳回,表示不是担保函驳回数据,在担保函表中插入一条数据
                         DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml

@@ -143,6 +143,11 @@
         WHERE business_id = #{businessId} AND role_id = #{roleId}
     </update>
 
+    <!-- 根据业务id更新担保函的审核状态 -->
+    <update id="updateGuaranteeLetterAuditStatusByBusinessId">
+        UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus} WHERE business_id = #{businessId}
+    </update>
+
     <!-- 根据id绑定用户id -->
     <update id="updateLoanCommitteeConsiderUserIdById">
         UPDATE dg_loan_committee_consider SET consider_id = #{userId} WHERE id = #{id}

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -353,7 +353,9 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
         // 用户的唯一标识（openid）
         String openid = (String) json.get("openid");
 
-        System.out.println("session_key======"+session_key+"openid===="+openid);
+        String unionid = json.get("unionid").toString();
+
+        System.out.println("session_key======"+session_key+"openid===="+openid+"unionid===="+unionid);
 
         Map map = new HashMap();
 
@@ -376,9 +378,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
                 userInfo.put("province", userInfoJSON.get("province"));
                 userInfo.put("country", userInfoJSON.get("country"));
                 userInfo.put("avatarUrl", userInfoJSON.get("avatarUrl"));
-                userInfo.put("unionId", userInfoJSON.get("unionId"));
+                //userInfo.put("unionId", userInfoJSON.get("unionId"));
+                userInfo.put("unionId", unionid);
 
-                System.out.println("unionId============"+userInfoJSON.get("unionId"));
+                System.out.println("unionId1============"+userInfoJSON.get("unionId"));
+                System.out.println("unionId2============"+userInfoJSON.get("unionId"));
                 map.put("userInfo", userInfo);
             } else {
                 map.put("status", 0);
@@ -422,6 +426,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
                 userEntity.setWechatId(md5UnionId);//加密后unionId
                 userEntity.setHeadPortaritUrl(userMap.get("avatarUrl").toString());//头像路径
                 userEntity.setCreateTime(new Date());//创建时间
+                userEntity.setType(loginRequest.getType());//登录类型(1:手机号 2:微信扫码登录 3:客户小程序登录 4：企业小程序登录)
                 userLoginDao.insert(userEntity);
                 loginRequest.setPhone(userMap.get("nickName").toString());//账号默认为微信名称
             }

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/WXBizDataCrypt.java

@@ -123,9 +123,15 @@ public class WXBizDataCrypt {
 
     public static void main(String[] args) throws Exception {
 
+        String iv="o/0EyFuVSUnsBjYHSExRnQ==";
+        String sessionKey="7DU6CyigMSSVgR9JHXuMFA==";
+        String encryptedData="Wwt3s0dUvUgtyZ9qwA0Rv4shePwN/6krOTb8WhJre/4lF+rO9tp+clUsjUqilngXZuTUYGcQt0WM6zNyCSNjK2q8/B9LLOc4Pu2KuIHLgfR+3NcF+q/sEs/vjrPMbjGQam5xQ6sl5iQVXa431S3i9hSj/2Hrp2lWdZ3NyytaGzakSsL8Wun1M05bvZ9bRqxnfyA726ILNb2O+OBehKKql2LwGW2g0J6R4Jwmfp5D5MzVDQZtB4UWhTJjHkq9FQZnI7I5oh4LpE74GClIUMoVCAEAB6g2M450n32sxSusM8lNemEG1ZCMvgRde9oYecMvBUNtXvtXzB/QZbQznt/Oh+EzmVArqhH/e7n+Ij23PNmiPbeD+zPNdmzn5Qhd5DPQaUrLxo6CqekmhdPtf1+AiU4AmQtHJNsD+aO4VP0va4s=";
+
+/*
         String iv="dvIIKwlnHIneQrj1ZGhhWQ==";
         String sessionKey="xUkcqKQdaK0vpVUXj8ityA==";
         String encryptedData="nK44nXrhAtBbmwBNgZ+du5mJbGoEr9pyPJG3upfQq6GXK3IKDHGkec6HDxGyBGe1qCs2kwLIOzm24da4o7cb6eEeNbewj18SMsWErGE3KWfy1b2BEg1ttu8oKp9Eatsmofavn/TnZeZSXVe5hDsmJSUPPRidjVp6AWCmOiQLCjY2RiNjpVx2fdgVvrzARK6IOlYyoL0soMUQXt0jnTdza5XVUbY/iTLbVc5Hrbw52+/n2tphoBc1iFXlkkKsJiHL6482LAZ43U5ev/AWoEV/lGfs4APktlppWjdIQkXFlpnb4z5TV0S5QT4D4fxigvjIi6MgTO9CYViCVS7K3/WK0JeuMS61dKJLAriajZN1LiBJhz29jG1PctEnGS56C+o59PrUKfULvRD6U0cGLpgsVuyFM6EFVgz7NIEmBC4gOVGnOSAenkc++xVvVUf164SBMIQItVXaYSv+13Dat43CyHmN+bZowJz0ghJ730gPv3f01RqCMmjrWwQuBzZi8RuXNPIBzpBhymfvnM8QF+FjXA==";
+*/
 
 /*        Map<String, Object> userInfo = getUserInfo(encryptedData, sessionKey, iv);
         System.out.println(userInfo);

dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml

@@ -48,7 +48,9 @@
         <if test="wechatId != null and wechatId != '' ">
             and hu.wechat_id = #{wechatId}
         </if>
-
+        <if test="type != null">
+            and hu.type = #{type}
+        </if>
     </select>
 
     <select id="selectByPhoneAccount" resultType="com.daqing.framework.domain.hrms.UserEntity">

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/UserEntity.java

@@ -100,4 +100,9 @@ public class UserEntity implements Serializable {
 	 */
 	private String headPortaritUrl;
 
+	/**
+	 * 登录类型(1:手机号 2:微信扫码登录 3:客户小程序登录 4：企业小程序登录)
+	 */
+	private Integer type;
+
 }