更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -220,6 +220,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         if (CollectionUtils.isEmpty(targetUserList)) {
             userDO.setUserName("临时用户");
             userDO.setPhone(commonUser.getPhone());
+            userDO.setCid(commonUser.getCid());
             userDO.setPassword(Md5Crypt.md5Crypt(password.getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));
             this.insert(userDO);
         } else {
@@ -228,6 +229,9 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             if (userDO.getStatus() == 0) {
                 throw new AppServiceException(ExceptionDefinition.USER_CAN_NOT_ACTICE);
             }
+            else{
+                userDO.setCid(commonUser.getCid());
+            }
         }
         if (commonUser.getPhone() != null) {
             DBConnection();
@@ -300,11 +304,16 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         if (user == null) {
             throw new AppServiceException(ExceptionDefinition.USER_PHONE_OR_PASSWORD_NOT_CORRECT);
         }
+
+
         CommonUser userDO = this.selectById(user.getId());
         //检查帐号是否已经冻结
         if (userDO.getStatus() == 0) {
             throw new AppServiceException(ExceptionDefinition.USER_CAN_NOT_ACTICE);
         }
+        else{
+            userDO.setCid(commonUser.getCid());
+        }
         if (commonUser.getPhone() != null) {
             DBConnection();
             String sUserId = null;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeTuiUtils.java

@@ -16,6 +16,7 @@ import com.getui.push.v2.sdk.dto.req.message.android.Ups;
 import com.getui.push.v2.sdk.dto.req.message.ios.Alert;
 import com.getui.push.v2.sdk.dto.req.message.ios.Aps;
 import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO;
+import com.gexin.rp.sdk.base.impl.Target;
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CommonUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,8 +111,8 @@ public class GeTuiUtils {
 
             // PushMessage在线走个推通道才会起作用的消息体
             PushMessage pushMessage = new PushMessage();
-            pushDTO.setPushMessage(pushMessage);
             pushMessage.setTransmission(" {title:\""+title+"\",content:\""+content+"\",payload:\"test\"}");
+            pushDTO.setPushMessage(pushMessage);
 //            pushMessage.setTransmission(" {title:\"标题\",content:\"内容\",payload:\"自定义数据\"}");
             // 设置接收人信息
             Audience audience = new Audience();