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

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/AccessGatewayFilter.java

@@ -169,7 +169,7 @@ public class AccessGatewayFilter implements GlobalFilter {
             public boolean test(PermissionInfo permissionInfo) {
                 String uri = permissionInfo.getUri();
                 if (uri.indexOf("{") > 0) {
-                    uri = uri.replaceAll("\\{\\*\\}", "[a-zA-Z\\\\d]+");
+                    uri = uri.replaceAll("\\{\\*\\}", "[a-zA-Z-\\\\d]+");
                 }
                 String regEx = "^" + uri + "$";
                 return (Pattern.compile(regEx).matcher(requestUri).find())

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -3,6 +3,8 @@ package com.github.wxiaoqi.security.admin.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 
 /**
  * 用户会员
@@ -57,7 +59,12 @@ public class UserMemberDTO  {
 	@ApiModelProperty(value = "购买次数")
 	private Integer buyCount;
 
-
+	/**
+	 * 有效期;0代表永久
+	 */
+	@Column(name = "valid_time")
+	@ApiModelProperty(value = "有效期;0代表永久")
+	private Long validTime;
 	
 
 }

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

@@ -133,6 +133,8 @@ public class BaseUserMember implements Serializable {
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
     private Integer isDel;
 
+
+
     @Column(name = "recent_recharge")
 	private Long recentRecharge;
 

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

@@ -102,4 +102,20 @@ public class ActivityPopularize implements Serializable {
 	@ApiModelProperty(value = "活动结束时间")
 	@JSONField(serializeUsing= ToStringSerializer.class)
 	private Long endTime;
+
+
+	/**
+	 *  人数限制 -1--无限制
+	 */
+	@Column(name = "num_limit")
+	@ApiModelProperty(value = "人数限制 -1--无限制")
+	private Integer numLimit;
+
+	/**
+	 *  当前状态 1--上架 2--下架
+	 */
+	@Column(name = "status")
+	@ApiModelProperty(value = "当前状态 1--上架 2--下架")
+	private Integer status;
+
 }

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

@@ -5,6 +5,8 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.activity.entity.ActivityList;
 import com.xxfc.platform.activity.entity.ActivityManagement;
+import com.xxfc.platform.activity.entity.ActivityPopularize;
+import com.xxfc.platform.activity.entity.ActivityRule;
 import com.xxfc.platform.activity.mapper.ActivityManagementMapper;
 import com.xxfc.platform.activity.vo.ActivityManagementQuery;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +28,11 @@ public class ActivityManagementBiz extends BaseBiz<ActivityManagementMapper, Act
     @Autowired
     private ActivityListBiz activityListBiz;
 
+    @Autowired
+    private ActivityPopularizeBiz activityPopularizeBiz;
+
+    @Autowired
+    private ActivityRuleBiz activityRuleBiz;
     /**
      * 查询所有活动
      * @return
@@ -83,5 +90,22 @@ public class ActivityManagementBiz extends BaseBiz<ActivityManagementMapper, Act
         ActivityList activityList= new ActivityList();
         BeanUtilsBean.getInstance().copyProperties(activityList,activityManagement);
         activityListBiz.updateSelectiveByIdRe(activityList);
+        if (activityList.getType()==1) {
+            ActivityRule activityRule = new ActivityRule();
+//            activityRule.setStartTime(activityList.getStartTime());
+//            activityRule.setEndTime(activityList.getEndTime());
+            activityRule.setStatus(activityList.getStatus());
+            activityRule.setNumber(activityList.getNumLimit());
+            activityRuleBiz.updateSelectiveByIdRe(activityRule);
+        }
+
+        if (activityList.getType()==2) {
+            ActivityPopularize activityPopularize = new ActivityPopularize();
+            activityPopularize.setStartTime(activityList.getStartTime());
+            activityPopularize.setEndTime(activityList.getEndTime());
+            activityPopularize.setStatus(activityList.getStatus());
+            activityPopularize.setNumLimit(activityList.getNumLimit());
+            activityPopularizeBiz.updateSelectiveByIdRe(activityPopularize);
+        }
     }
 }

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

@@ -3,12 +3,23 @@ package com.xxfc.platform.order.entity;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.Date;
 
 @Data
 public class DailyOrderStatistics {
 
-    @Column()
-    private Date oneDay;
+    @Column(name = "one_day")
+    private System oneDay;
+
+    @Column(name = "total_orders")
+    private BigInteger totalOrders;
+
+    @Column(name = "actual_total_income")
+    private BigDecimal actualTotalIncome;
+
+
+
 
 }

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

@@ -619,10 +619,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             log.error(e.getMessage(), e);
         }
     }
-//    @Scheduled(cron = "0 0 2 * * ? ")
-//    private void  countDailyOrdersRegularly(){
-//        DailyOrderStatistics dailyOrderStatistics= mapper.getTotalOrder();
-//    }
-//
+    @Scheduled(cron = "0 0 2 * * ? ")
+    private void  countDailyOrdersRegularly(){
+        DailyOrderStatistics dailyOrderStatistics= mapper.getTotalOrder();
+    }
+
 
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.DailyOrderStatistics;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import tk.mybatis.mapper.common.Mapper;
@@ -27,5 +28,5 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	public OrderPageVO getOrderDetail(String no);
 
-    Integer getTotalOrder();
+	DailyOrderStatistics getTotalOrder();
 }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -206,15 +206,32 @@
     </select>
 
     <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">
-      select
-        date_format(crt_time,'%Y-%c-%d') as oneDay,
-        SUM(1)
+
+        select
+        date_format(pay_time,'%Y-%c-%d') as oneDay,
+        sum(1) as totalOrders,
+        sum(pay_time)as actualTotalIncome
+        from
+        base_order
+        where
+        date(pay_time)=date(now())-1
+        group by
+        date_format(pay_time,'%d')
+    </select>
+
+
+    <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">
+
+        select
+        date_format(refund_time,'%Y-%c-%d') as oneDay,
+        sum(1) as totalOrders,
+        sum(refund_time)as actualTotalIncome
         from
         base_order
         where
-        date(crt_time)=date(now())-1
+        date(refund_time)=date(now())-1
         group by
-        date_format(crt_time,'%d')
+        date_format(refund_time,'%d')
     </select>
 
 </mapper>
\ No newline at end of file

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/IdInformation.java

@@ -28,40 +28,79 @@ public class IdInformation implements Serializable {
     private Integer id;
 
 
-    //证件号
+    /**
+     *   证件号
+     */
     @Column(name ="id_number")
     private String  idNumber;
 
-    //用户真实姓名
-    private String name;
 
+    /**
+     * 用户真实姓名
+     */
+    private String name;
 
-    //用户id
+    /**
+     *
+     */
+    /**
+     * 用户id
+     */
     @Column(name = "user_login_id")
     private Integer  userLonginId;
 
-
-    //证件类型
+    /**
+     *
+     */
+    /**
+     * 证件类型
+     */
     @Column(name = "certificate_type")
     private Integer  certificateType;
 
-    //正面url
+    /**
+     * 正面url
+     */
     @Column(name = "front_url")
     private String  frontUrl;
 
 
-    //背面url
+    /**
+     * 背面url
+     */
     @Column(name = "back_url")
     private String  backUrl;
 
-    //到期时间
+    /**
+     *到期时间
+     */
     @Column(name = "expiration_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyyMMdd",timezone="GMT+8")
     private Date expirationDate;
 
-    //认证方式
+    /**
+     * 认证方式
+     */
     @Column(name = "authentication_methods")
     private Integer authenticationMethods;
 
+    /**
+     *创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH;mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH;mm:ss",timezone = "GMT+8")
+    @Column(name = "crt_time")
+    private Date crtTime;
+
+    /**
+     * 修改时间
+     */
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH;mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH;mm:ss",timezone = "GMT+8")
+    @Column(name = "upd_time")
+    private Date updTime;
+
+
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -12,6 +12,7 @@ import com.xxfc.platform.universal.utils.CertifHttpUtils;
 import com.xxfc.platform.universal.utils.Validation;
 import javafx.application.Application;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -401,7 +403,19 @@ public class CertificationService {
 
         //保存认证信息
         try {
-            idInformationMapper.insertSelective(idInformation);
+            Example exa = new Example(IdInformation.class);
+            Example.Criteria criteria = exa.createCriteria();
+            criteria.andEqualTo("idNumber",idInformation.getIdNumber());
+            List<IdInformation> idInformations = idInformationMapper.selectByExample(exa);
+            if (CollectionUtils.isEmpty(idInformations)) {
+                idInformation.setCrtTime(new Date());
+                idInformationMapper.insertSelective(idInformation);
+            }else {
+                IdInformation idInformation1 = idInformations.get(0);
+                idInformation.setId(idInformation1.getId());
+                idInformation.setUpdTime(new Date());
+                idInformationMapper.updateByPrimaryKeySelective(idInformation);
+            }
             //认证成功后修改用户,用户认证状态
             ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLonginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
            return ObjectRestResponse.succ(idInformation.getId());