Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

@@ -30,10 +30,10 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
             //支付完成后永久绑定关系
             add(new BindDTO(ORDER_RELATION_QUEUE, ADMIN_TOPIC, KEY_ORDER_PAY));
             //拥金计算
-            add(new BindDTO(ORDER_WATER_QUEUE, ADMIN_TOPIC, KEY_ORDER_PAY));
-            add(new BindDTO(ORDER_WATER_QUEUE, ADMIN_TOPIC, KEY_ORDER_FINLISH));
-            add(new BindDTO(ORDER_WATER_QUEUE, ADMIN_TOPIC, KEY_ORDER_CANCEL));
-            add(new BindDTO(ORDER_FINLISH_USER_RE_QUEUE,  ADMIN_TOPIC, KEY_ORDER_FINLISH));
+            add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_PAY));
+            add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_FINLISH));
+            add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_CANCEL));
+            add(new BindDTO(ORDER_FINLISH_USER_RE_QUEUE,  ORDER_TOPIC, KEY_ORDER_FINLISH));
             //钱包
             add(new BindDTO(WALLET_ADD_QUEUE,  ADMIN_TOPIC,KEY_WALLET_ADD ));
         }};

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -95,7 +95,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                 if(relationBiz.selectList(new ActivityPopularizeRelation(){{
                     setMajorUserId(appUserDTO.getUserid());
                     setPopularizeId(activityPopularize.getId());
-                }}).size() >= 10) {
+                }}).size() >= 2) {
                     activityPopularizeUser.setStatus(SYS_TRUE);
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     popularizeLog.setStatus(SYS_TRUE);

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -240,6 +240,6 @@ public class BaseOrder implements Serializable {
 	 * 使用的优惠券票号，逗号分割
 	 */
 	@ApiModelProperty(value = "使用的优惠券票号，逗号分割")
-	@Column(name = "coupon_ticker_no")
+	@Column(name = "coupon_ticker_nos")
 	private String couponTickerNos;
 }