Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/annotation/CheckBizType.java

+package com.github.wxiaoqi.security.auth.client.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 检测是否符合端登录
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(value={ElementType.METHOD,ElementType.TYPE})
+public @interface CheckBizType {
+}

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageParam.java

 package com.github.wxiaoqi.security.common.vo;
 
+import com.github.wxiaoqi.security.common.util.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,5 +11,7 @@ public class PageParam {
     @ApiModelProperty("每页限制")
     Integer limit;
 
-
+    public Query initQuery() {
+        return new Query(this);
+    }
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java

@@ -91,6 +91,9 @@ public class User {
     @Column(name = "data_corporation")
     private String dataCorporation;
 
+    @Column(name = "biz_type")
+    private String bizType;
+
     private String attr1;
 
     private String attr2;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java

@@ -10,7 +10,10 @@ import com.github.wxiaoqi.security.admin.vo.GroupUsers;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.TreeUtil;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.Api;
+import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +40,9 @@ public class GroupController extends BaseController<GroupBiz, Group> {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     public List<Group> list(String name,String groupType) {
-        if(StringUtils.isBlank(name)&&StringUtils.isBlank(groupType)) {
-            return new ArrayList<Group>();
-        }
+//        if(StringUtils.isBlank(name)&&StringUtils.isBlank(groupType)) {
+//            return new ArrayList<Group>();
+//        }
         Example example = new Example(Group.class);
         if (StringUtils.isNotBlank(name)) {
             example.createCriteria().andLike("name", "%" + name + "%");
@@ -50,6 +53,13 @@ public class GroupController extends BaseController<GroupBiz, Group> {
 
         return baseBiz.selectByExample(example);
     }
+
+    @RequestMapping(value = "/listPage", method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<PageDataVO<Group>> listPage(ListPageDTO dto) {
+        return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> list(dto.getName(), dto.getGroupType())));
+    }
+
     @GetMapping(value = "/list_all")
     @ResponseBody
     public List<Group> listAll() {
@@ -158,4 +168,10 @@ public class GroupController extends BaseController<GroupBiz, Group> {
         }
         return TreeUtil.bulid(trees,root) ;
     }
+
+    @Data
+    static public class ListPageDTO extends PageParam {
+        String name;
+        String groupType;
+    }
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/CouponDTO.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.activity.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 
 /**
@@ -103,4 +104,11 @@ public class CouponDTO {
 
     @ApiModelProperty(value = "跳转链接")
     private String url;
+
+    /**
+     *  可使用门店ids
+     */
+    @Column(name = "company_ids")
+    @ApiModelProperty(value = "可使用门店ids")
+    private String companyIds;
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/Coupon.java

@@ -237,11 +237,18 @@ public class Coupon implements Serializable {
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long updTime;
 	
-	    /**
+	/**
      *  是否删除；0-正常；1-删除
      */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
     private Integer isDel;
 
+	/**
+	 *  可使用门店ids
+	 */
+	@Column(name = "company_ids")
+	@ApiModelProperty(value = "可使用门店ids")
+	private String companyIds;
+
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/UserCoupon.java

@@ -106,6 +106,12 @@ public class UserCoupon implements Serializable {
 	@Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
 	private Integer isDel;
-	
+
+	/**
+	 *  可使用门店ids
+	 */
+	@Column(name = "company_ids")
+	@ApiModelProperty(value = "可使用门店ids")
+	private String companyIds;
 
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java

@@ -161,6 +161,7 @@ public class OrderCalculateBiz {
             if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
                 List<BigDecimal> couponAmounts = Lists.newArrayList();
                 for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
+                    //如果优惠券已经使用了，则会返回 0 元
                     BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);
                     if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
                         //能够使用优惠券，则不返还