Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.admin.vo.InviteMemberVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.aop.framework.AopContext;
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
  * @date 2019-07-03 16:36:44
  */
 @Service
+@Slf4j
 public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRelation> {
 
     @Autowired
@@ -56,6 +58,10 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
      * @param parentId
      */
     public   void bindRelation(Integer userId,Integer parentId,Integer type){
+        if (userId==parentId){
+            log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
+            return;
+        }
         AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
          if(relation==null){
              relation=new AppUserRelation();
@@ -265,9 +271,14 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     }
 
     public void deleteByMemberIds(Collection<Integer> userIds) {
-     Example example = new Example(AppUserRelation.class);
+       Example example = new Example(AppUserRelation.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("userId",userIds);
+        criteria.andIn("parentId",userIds);
         mapper.deleteByExample(example);
+
+        Example example2 = new Example(AppUserRelation.class);
+        Example.Criteria criteria1 = example2.createCriteria();
+        criteria1.andIn("userId",userIds);
+        mapper.deleteByExample(example2);
     }
 }
\ No newline at end of file

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -32,6 +32,39 @@ public class SmsTemplateDTO {
     //取消订单
     public static final int CANCEL = 8;
 
+    //租车（通用）
+    public static final int PAY_A = 10;
+    //租车（使用会员权益）
+    public static final int PAY_B = 11;
+    //租车内部通知（客服)
+    public static final int PAY_C = 12;
+    //租车内部通知（出车人）
+    public static final int PAY_D = 13;
+    //租车内部通知（收车人）
+    public static final int PAY_E = 14;
+    //旅游（通用）
+    public static final int PAY_F = 15;
+    //会员购买（通用）
+    public static final int PAY_G = 16;
+
+    //取消租车（通用）
+    public static final int CANCEL_A = 17;
+    //取消租车（使用会员权益）
+    public static final int CANCEL_B = 18;
+    //取消租车（通用扣违约金）
+    public static final int CANCEL_C = 19;
+    //取消租车（会员权益&扣违)
+    public static final int CANCEL_D = 20;
+    //取消租车（出车人）
+    public static final int CANCEL_E = 21;
+
+    //租车押金退还
+    public static final int FINISH_A = 22;
+    //违章押金退还
+    public static final int FINISH_B = 23;
+
+
+
     //类型:1-租车订单通知(普通用户),2-租车订单短信(会员权益),3-旅游订单短信,4-加入会员通知
     private Integer type;
     //手机号码（多个短信逗号隔开）

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/CCPRestSmsBiz.java

@@ -23,10 +23,45 @@ public class CCPRestSmsBiz{
     public static final String TEMPLATE_ID_DIFFERENT_TAAKE_CAR = "458621";
     // 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)7
     public static final String TEMPLATE_ID_ALSO_CAR = "458620";
-    //取消订单8
+    //取消订单9
     public static final String TEMPLATE_ID_CANCEL = "458627";
 
 
+    //租车（通用）10
+    public static final String TEMPLATE_ID_PAY_A = "460759";
+    //租车（使用会员权益）11
+    public static final String TEMPLATE_ID_PAY_B = "460760";
+    //租车内部通知（客服）12
+    public static final String TEMPLATE_ID_PAY_C = "460763";
+    //租车内部通知（出车人）13
+    public static final String TEMPLATE_ID_PAY_D = "460762";
+    //租车内部通知（收车人）14
+    public static final String TEMPLATE_ID_PAY_E = "460764";
+    //旅游（通用）15
+    public static final String TEMPLATE_ID_PAY_F = "460765";
+    //会员购买（通用）16
+    public static final String TEMPLATE_ID_PAY_G = "460766";
+
+    //取消租车（通用）17
+    public static final String TEMPLATE_ID_CANCEL_A= "460767";
+    //取消租车（使用会员权益）18
+    public static final String TEMPLATE_ID_CANCEL_B = "460768";
+    //取消租车（通用扣违约金）19
+    public static final String TEMPLATE_ID_CANCEL_C = "460769";
+    //取消租车（会员权益&扣违 20
+    public static final String TEMPLATE_ID_CANCEL_D = "460770";
+    //取消租车（出车人）21
+    public static final String TEMPLATE_ID_CANCEL_E = "460771";
+
+    //租车押金退还 22
+    public static final String TEMPLATE_ID_FINISH_A = "460772";
+    //违章押金退还 23
+    public static final String TEMPLATE_ID_FINISH_B = "460773";
+
+
+
+
+
     //发送模板消息
     public  void  sendTemplateSMS(Integer type,String phoneNumbers,String[]params){
          switch (type){
@@ -54,6 +89,49 @@ public class CCPRestSmsBiz{
              case 8 :
                  CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL);
                  break;
+             case 10 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_A);
+                 break;
+             case 11:
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_B);
+                 break;
+             case 12 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_C);
+                 break;
+             case 13 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_D);
+                 break;
+             case 14 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_E);
+                 break;
+             case 15 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_F);
+                 break;
+             case 16 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_G);
+                 break;
+             case 17 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_A);
+                 break;
+             case 18 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_B);
+                 break;
+             case 19 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_C);
+                 break;
+             case 20 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_D);
+                 break;
+             case 21 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_E);
+                 break;
+             case 22 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_FINISH_A);
+                 break;
+             case 23 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_FINISH_B);
+                 break;
+
          }
 
     }