Merge remote-tracking branch 'origin/dev' into dev

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

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.vo.UserTeamMemberVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -108,7 +109,9 @@ public class UserBusinessBiz {
                 promoteBO.setLeaderUsername(userIdAndUserLoginMap.get(leaderId).getUsername());
             }
             if (!userIdAndUserDetailMap.isEmpty()) {
-                promoteBO.setLeaderHeadUrl(userIdAndUserDetailMap.get(leaderId).getHeadimgurl());
+                AppUserDetail appUserDetail = userIdAndUserDetailMap.get(leaderId);
+                promoteBO.setLeaderHeadUrl(StringUtils.isEmpty(appUserDetail.getHeadimgurl()) ? "" : appUserDetail.getHeadimgurl());
+                promoteBO.setLeaderUsername(StringUtils.isEmpty(appUserDetail.getRealname()) ? promoteBO.getLeaderUsername() : appUserDetail.getRealname());
             }
         }
         promoteBO.setInviteNumber(memberStateAndCountMap.get(0));

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -33,25 +33,34 @@ FROM
     </select>
 
     <select id="selectSellerWalterByUserIdAndWating" resultType="com.github.wxiaoqi.security.admin.vo.SellingWalletVo">
-        <!--        SELECT
-                *
-                FROM
-                (
+        <!--
           SELECT
-                ausw.*,
-                IFNULL( ausw.commission, 0 ) - IFNULL( auswt.commission, 0 ) AS `commissionnm`,
-                auswt.status AS  sellerStatus,
-                IFNULL(auswt.status,0) AS `isShow`
-                FROM
-                ( SELECT * FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id`=#{userId} <if test="wating!=null">
-                AND `waiting`=#{wating} &lt;!&ndash;AND `status`=0&ndash;&gt;
-            </if>) AS `ausw`
-                LEFT JOIN ( SELECT * FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id`=#{userId} <if
-                    test="wating!=null">
-                AND `waiting`=#{wating} &lt;!&ndash;AND `status`=0&ndash;&gt;
-            </if>) AS `auswt` ON auswt.order_no = ausw.order_no
-                ) AS `auswres`
-                ORDER BY 	crt_time DESC-->
+	e.*,
+	f.order_no AS `f_order`,
+	f.outcommission,
+	( IFNULL( e.incommission, 0 ) - IFNULL( f.outcommission, 0 ) ) AS `final_commission` ,
+	f.sellerStatus,
+	f.cancelTime
+FROM
+	(
+SELECT
+	a.*,
+	b.incommission
+FROM
+	( SELECT * FROM `app_user_selling_water` WHERE STATUS = 0 and user_id=313 ) AS `a`
+	INNER JOIN ( SELECT order_no, IFNULL( SUM( commission ), 0 ) AS `incommission` FROM `app_user_selling_water` WHERE `status` = 0 and user_id=313 GROUP BY `order_no` ) AS `b` ON a.order_no = b.order_no
+	) AS `e`
+	LEFT JOIN (
+SELECT
+	c.order_no,
+	d.outcommission,
+   1 AS `sellerStatus`,
+	 c.crt_time AS `cancelTime`
+FROM
+	( SELECT * FROM `app_user_selling_water` WHERE STATUS = 1 and user_id=313 ) AS `c`
+	INNER JOIN ( SELECT order_no,IFNULL( SUM( commission ), 0 ) AS `outcommission` FROM `app_user_selling_water` WHERE `status` = 1 and user_id=313 GROUP BY `order_no` ) AS `d` ON c.order_no = d.order_no
+	) AS `f` ON e.order_no = f.order_no
+          -->
 
 
         SELECT w.*,o.commission as commission ,o.type AS `sellerStatus` FROM (

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

@@ -9,12 +9,10 @@ import com.xxfc.platform.activity.vo.ActivityRuleVo;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.xxfc.platform.activity.entity.ActivityRule;
 import com.xxfc.platform.activity.mapper.ActivityRuleMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -66,7 +64,11 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                             Integer id=array.getJSONObject(i).getInteger("id");
                             Coupon coupon=couponBiz.selectById(id);
                             if (coupon!=null&&coupon.getIsDel()==0&&coupon.getStatus()==1){
-                                coupons.add(couponBiz.selectById(id));
+                                if (coupon.getValidType()==2){
+                                    int days=coupon.getValidDays()==null?0:coupon.getValidDays();
+                                    coupon.setValidEndTime(System.currentTimeMillis()+(days*24*60*60*1000L));
+                                }
+                                coupons.add(coupon);
                             }
                         }
                     }