cps公众号消息推送

@@ -96,8 +96,6 @@
 			<groupId>com.yoho.dsf</groupId>
 			<artifactId>yoho-message-sdk</artifactId>
 			<version>1.0.4-SNAPSHOT</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/yoho-message-sdk-1.0.4-SNAPSHOT.jar</systemPath>
 		</dependency>
 	</dependencies>
 </project>

@@ -9,7 +9,7 @@ public enum ShareOrdersStatusEnum {
 
     //10-已支付 -> 20-可结算、91-不可结算取消、92-不可结算退货、93-不可结算换货、100 因拆单作废
     //20-可结算 -> 30-打款中 -> 40-已打款
-    PAY(1,"10","已支付","待确认"),
+    PAY(1,"10","已支付","待结算"),
     CAN_SETTLE(2,"20","可结算","已达成"),
     SETTLE(3,"30","打款中","打款中"),
     HAS_SETTLE(4,"40","已打款","已打款"),

@@ -639,8 +639,8 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         int result = unionShareUserMapper.insertSelective(unionShareUser);
         if (result > 0) {
             logger.info("relateUnionType,begin to send message,uid is {},unionType is {}", uid,unionDepartmentUrl.getUnionType());
-            //
-            sendMessageHelper.sendMessage(uid,1,unionShareUser.getCreateTime(),null);
+            ////发送联盟用户申请成功公众号消息
+            sendMessageHelper.sendMessage(uid,4,unionShareUser.getCreateTime(),null);
             //发送联盟用户申请成功短信
             sendSmsService.smsSendByMobile(UNION_SHARE_USER_APPLY_PASS_SMS_CONTENT, Lists.newArrayList(mobile));
         }
@@ -1167,7 +1167,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         //10.待确认 20.待提现 30.提现中 40.提现成功 91.订单取消 92.订单退货 93.订单换货 100.不可结算
         switch (Integer.valueOf(shareOrderBo.getStatus())){
             case 10:
-                shareOrderBo.setOrderStatus("待确认");
+                shareOrderBo.setOrderStatus("待结算");
                 break;
             case 20:
                 shareOrderBo.setOrderStatus("待提现");