Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/MessageFeignClient.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * systemctl-消息
  */
-@FeignClient(contextId = "jyjc", name = "${privilege.feign.name:AMOS-API-PRIVILEGE}", path = "/v1/message", configuration = {XidFeignConfiguration.class})
+@FeignClient(contextId = "jyjc", name = "${privilege.feign.name:AMOS-API-PRIVILEGE}", path = "/systemctl/v1/message", configuration = {XidFeignConfiguration.class})
 public interface MessageFeignClient {
 
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -784,7 +784,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      */
     private void send(String userId, String relationId, String companyType) {
         MessageModel messageModel = new MessageModel();
-        messageModel.setUserId(userId);
+        messageModel.setRecivers(Collections.singletonList(userId));
         messageModel.setMsgTypeLabel("检验检验业务开通");
         messageModel.setMsgType("openApp");
         messageModel.setTitle("签署承诺书");
@@ -793,6 +793,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         messageModel.setTerminal("WEB");
         messageModel.setRoutePath(msgDetailPath);
         messageModel.setCompanyType(companyType);
+        messageModel.setIsRead(false);
         messageFeignClient.create(messageModel);
     }
 
@@ -821,6 +822,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                         BeanUtils.copyProperties(e, licence);
                         licence.setSequenceNbr(sequence.nextId());
                         licence.setItemCode(itemCode);
+                        licence.setUnitCode(jyjcOpeningApplication.getUnitCode());
+                        licence.setUnitName(jyjcOpeningApplication.getUnitCodeName());
                         licence.setEnterpriseCertSeq(cert.getSequenceNbr().toString());
                         licences.add(licence);
                     });