Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/resources/config/mybatis/HfMemberMapper.xml

@@ -28,6 +28,8 @@
         <result column="update_time_" property="updateTime"/>
         <result column="organ_id_" property="organId"/>
 		<result column="tenant_id_" property="tenantId" />
+		<result column="bank_acct_type_" property="bankAcctType" />
+		<result column="card_name_" property="cardName" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
@@ -35,7 +37,7 @@
         business_scope_, legal_person_, legal_cert_id_, legal_cert_id_expires_, legal_mp_,
         address_, zip_code_, card_no_,
         bank_code_,settle_account_id_,status_,month_max_receipt_,route_member_id_,route_organ_id_, create_time_,
-        update_time_,tenant_id_,organ_id_
+        update_time_,tenant_id_,organ_id_,bank_acct_type_,card_name_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="hfMember">
         <!--@mbg.generated-->
@@ -57,13 +59,13 @@
         business_scope_, legal_person_, legal_cert_id_,
         legal_cert_id_expires_, legal_mp_, address_,
         zip_code_, card_no_, bank_code_,status_,
-        create_time_, update_time_,organ_id_,tenant_id_)
+        create_time_, update_time_,organ_id_,tenant_id_,bank_acct_type_,card_name_)
         values (#{name}, #{memberId}, #{provCode},
         #{areaCode}, #{socialCreditCode}, #{socialCreditCodeExpires},
         #{businessScope}, #{legalPerson}, #{legalCertId},
         #{legalCertIdExpires}, #{legalMp}, #{address},
         #{zipCode}, #{cardNo}, #{bankCode},#{status},
-        #{createTime}, #{updateTime},#{organId},#{tenantId})
+        #{createTime}, #{updateTime},#{organId},#{tenantId},#{bankAcctType},#{cardName})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.HfMember">
         <!--@mbg.generated-->
@@ -111,6 +113,12 @@
             <if test="cardNo != null">
                 card_no_ = #{cardNo},
             </if>
+            <if test="bankAcctType != null">
+                bank_acct_type_ = #{bankAcctType},
+            </if>
+            <if test="cardName != null">
+                card_name_ = #{cardName},
+            </if>
             <if test="bankCode != null">
                 bank_code_ = #{bankCode},
             </if>

mec-im/src/main/java/com/ym/controller/HereWhiteController.java

@@ -1,19 +1,28 @@
 package com.ym.controller;
 
 import com.ym.mec.common.controller.BaseController;
+import com.ym.pojo.HereWhite;
 import com.ym.service.HereWhiteService;
+import freemarker.cache.StringTemplateLoader;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
 @RestController
 @RequestMapping("/hereWhite")
 public class HereWhiteController  extends BaseController {
 
     @Autowired
     private HereWhiteService hereWhiteService;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
 
     /**
      * 创建白板，默认全部采用零时白板
@@ -28,7 +37,12 @@ public class HereWhiteController  extends BaseController {
         if(StringUtils.isEmpty(name) || userNum == null || courseScheduleId == null){
             return failed("参数校验失败");
         }
-        return succeed(hereWhiteService.create(name, userNum,courseScheduleId));
+        HereWhite hereWhite = hereWhiteService.create(name, userNum, courseScheduleId);
+        String joinSuccessKey = "createHereWhite:" + courseScheduleId;
+        String randomNumeric = RandomStringUtils.randomNumeric(22);
+        redisTemplate.opsForValue().set(joinSuccessKey,randomNumeric,2, TimeUnit.HOURS);
+        hereWhite.setRandomNumeric(randomNumeric);
+        return succeed(hereWhite);
     }
 
     /**
@@ -39,7 +53,12 @@ public class HereWhiteController  extends BaseController {
      */
     @RequestMapping(value = "get", method = RequestMethod.GET)
     public Object join(Integer courseScheduleId){
-        return succeed(hereWhiteService.getByClassId(courseScheduleId));
+        HereWhite hereWhite = hereWhiteService.getByClassId(courseScheduleId);
+        if(Objects.nonNull(hereWhite)){
+            String joinSuccessKey = "createHereWhite:" + courseScheduleId;
+            hereWhite.setRandomNumeric(redisTemplate.opsForValue().get(joinSuccessKey));
+        }
+        return succeed(hereWhite);
     }
 
 }

mec-im/src/main/java/com/ym/pojo/HereWhite.java

@@ -45,4 +45,6 @@ public class HereWhite implements Serializable {
     @Column(name = "created_at_")
     private @Getter @Setter Date createdAt;
 
+    private @Getter @Setter String randomNumeric;
+
 }

mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -10,7 +10,6 @@ import com.ym.service.RoomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
@@ -31,7 +30,7 @@ public class HereWhiteServiceImpl implements HereWhiteService {
     private RoomService roomService;
 
     @Override
-    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+    @Transactional(rollbackFor = Exception.class)
     public HereWhite create(String name, Integer userNum,Integer courseScheduleId) throws Exception {
         courseScheduleId = roomService.getCurrentCourseId(courseScheduleId.toString());
         JSONObject json = new JSONObject();

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/CorpMemberService.java

@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import com.huifu.adapay.core.exception.BaseAdaPayException;
@@ -18,12 +20,14 @@ import com.ym.mec.thirdparty.exception.ThirdpartyException;
 @Service
 public class CorpMemberService {
 
+	private final static Logger logger = LoggerFactory.getLogger(CorpMemberService.class);
+
 	public boolean create(String merchantKey, String appId, EnterpriseUser req, String notifyUrl) {
 
 		Map<String, Object> memberParams = new HashMap<String, Object>();
 		memberParams.put("member_id", req.getMemberId());
 		memberParams.put("app_id", appId);
-		memberParams.put("order_no", appId + "_" + System.currentTimeMillis());
+		memberParams.put("order_no", merchantKey + "_" + System.currentTimeMillis());
 		memberParams.put("social_credit_code_expires", req.getSocialCreditCodeExpires());
 		memberParams.put("business_scope", req.getBusinessScope());
 		memberParams.put("name", req.getName());
@@ -52,8 +56,9 @@ public class CorpMemberService {
 			} else {
 				resp = CorpMember.create(memberParams, req.getAttachFile());
 			}
+			logger.info("创建企业信息 Resp:{}",resp);
 		} catch (BaseAdaPayException e) {
-			new ThirdpartyException("创建企业用户失败:{}", e, e.getMessage());
+			throw new ThirdpartyException("创建企业用户失败:{}", e, e.getMessage());
 		}
 
 		return true;
@@ -61,9 +66,10 @@ public class CorpMemberService {
 	
 	public boolean update(String merchantKey, String appId, EnterpriseUser req, String notifyUrl){
 		Map<String, Object> memberParams = new HashMap<String, Object>();
+		memberParams.put("adapay_func_code", "corp_members.update");
 		memberParams.put("member_id", req.getMemberId());
 		memberParams.put("app_id", appId);
-		memberParams.put("order_no", appId + "_" + System.currentTimeMillis());
+		memberParams.put("order_no", merchantKey + "_" + System.currentTimeMillis());
 		memberParams.put("social_credit_code_expires", req.getSocialCreditCodeExpires());
 		memberParams.put("business_scope", req.getBusinessScope());
 		memberParams.put("name", req.getName());
@@ -87,8 +93,9 @@ public class CorpMemberService {
 			} else {
 				resp = AdapayCommon.requestAdapayFile(memberParams, req.getAttachFile());
 			}
+			logger.info("修改企业信息 Resp:{}",resp);
 		} catch (BaseAdaPayException e) {
-			new ThirdpartyException("修改企业用户信息失败:{}", e, e.getMessage());
+			throw new ThirdpartyException("修改企业用户信息失败:{}", e, e.getMessage());
 		}
 
 		return true;
@@ -123,7 +130,7 @@ public class CorpMemberService {
 				return user;
 			}
 		} catch (BaseAdaPayException e) {
-			new ThirdpartyException("查询企业用户信息失败:{}", e, e.getMessage());
+			throw new ThirdpartyException("查询企业用户信息失败:{}", e, e.getMessage());
 		}
 
 		return null;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/entity/EnterpriseUser.java

@@ -98,6 +98,8 @@ public class EnterpriseUser {
 	 */
 	private String notifyUrl;
 
+    private String zipCode;
+
 	public String getMemberId() {
 		return memberId;
 	}
@@ -241,4 +243,12 @@ public class EnterpriseUser {
 	public void setNotifyUrl(String notifyUrl) {
 		this.notifyUrl = notifyUrl;
 	}
+
+	public String getZipCode() {
+		return zipCode;
+	}
+
+	public void setZipCode(String zipCode) {
+		this.zipCode = zipCode;
+	}
 }

mec-web/src/main/resources/logback-spring.xml

@@ -102,7 +102,7 @@
 
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
-        <root level="WARN">
+        <root level="INFO">
             <appender-ref ref="stdout"/>
             <appender-ref ref="file"/>
         </root>