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

admin

2019-09-04 25941582a2c5c731b0ce413fa40f5495a1e8f0c2

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

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java

@@ -37,7 +37,7 @@
import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -244,7 +244,7 @@
     *            邀请嘛

     * @param out

     */

    @IntegralGetFrequencyLimit(key = "'activationInvite-'+#uid+'-'+#inviteCode", time = 30)

    @RequestSerializableByKey(key ="'activationInvite-'+#uid")

    @RequestMapping(value = "activationInvite")

    public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) {

        try {

@@ -281,8 +281,8 @@
     *            邀请嘛

     * @param out

     */

    @RequestSerializableByKey(key ="'activationInviteWX-'+#uid")

    @RequestMapping(value = "activationInviteWX")

    @IntegralGetFrequencyLimit(key = "'activationInviteWX-'+#uid+'-'+#code", time = 30)

    public void activationInviteWX(AcceptData acceptData, Long uid, String  code, PrintWriter out) {

        try {

            userInfoExtraService.activationInviteWX(uid, code);


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java

@@ -607,6 +607,7 @@
    public void updateRecord(AcceptData acceptData, String shareId, String type, PrintWriter out) {

        if (StringUtil.isNullOrEmpty(shareId)) {

            out.print(JsonUtil.loadFalseResult("参数不正确"));

            return;

        }



        // 更新分享生效


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -277,10 +277,7 @@
            return;

        }



        int count = 5;

        if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

            count = Integer.MAX_VALUE;

        }

        int count = Integer.MAX_VALUE;



        List<IntegralTaskRecord> list = integralTaskRecordService.listNotReceived(count, uid);

        if (list == null) {

@@ -333,24 +330,8 @@
                return;

            }

            Integer goldCoin = integralTaskRecordService.receiveGoldCoin(uid, idList);

            Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {

            }.getType());

            List<IntegralTaskRecord> list = null;

            if (gidList != null && gidList.size() > 0) {

                list = integralTaskRecordService.listNotReceivedExcludeId(5 - gidList.size(), uid, gidList);

            } else {

                list = integralTaskRecordService.listNotReceivedExcludeId(5, uid, null);

            }



            if (list == null) {

                list = new ArrayList<IntegralTaskRecord>();

            }

            GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

            Gson gson2 = gsonBuilder.create();



            JSONObject data = new JSONObject();

            data.put("goldCoin", goldCoin);

            data.put("list", gson2.toJson(list));

            out.print(JsonUtil.loadTrueResult(data));

        } catch (IntegralTaskRecordException e) {

            out.print(JsonUtil.loadFalseResult(e.getMsg()));


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/CodePublishRecordMapper.java

@@ -13,12 +13,11 @@
     * 查询近3天发布记录
     * @return
     */
    List<CodePublishRecord> listValid(@Param("start") long start, @Param("count") int count);
    List<CodePublishRecord> listValid(@Param("start") long start, @Param("count") int count, @Param("validTime")long validTime);
    
    
    long countValid();
    long countValid(@Param("validTime") long validTime);
    
    
    long countValidRecord(@Param("uid") long uid);
	
    long countValidRecord(@Param("uid") long uid, @Param("validTime") long validTime);
}

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java

@@ -53,7 +53,7 @@
    // 二级分享赚分销红包

    public final static int TYPE_SHARE_ERJI = 22;



    // 使用券红包

    // 金币兑换红包

    public final static int TYPE_EXCHANGE = 30;



    @Column(name = "hb_id")


 fanli/src/main/java/com/yeshi/fanli/entity/integral/CodePublishRecord.java

@@ -18,6 +18,9 @@
public class CodePublishRecord implements Serializable {



    private static final long serialVersionUID = 1L;

	
    // 发布有效时间

    public static final long VALIDTIME  = 3*24*60*60;



    @Expose

    @Column(name = "pr_id")


 fanli/src/main/java/com/yeshi/fanli/mapping/integral/CodePublishRecordMapper.xml

@@ -44,23 +44,22 @@
  </update>
  
  <select id="listValid" resultMap="BaseResultVOMap">
      SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code`  FROM yeshi_ec_code_publish_record p
    LEFT JOIN `yeshi_ec_user` u ON u.`id` = p.`pr_uid`
    LEFT JOIN `yeshi_ec_user_info_extra` e ON e.`uie_uid` = p.`pr_uid`
    WHERE DATE_SUB(CURDATE(), INTERVAL 3 DAY) <![CDATA[<]]> DATE(p.`pr_create_time`)
    ORDER BY p.`pr_create_time` DESC
    LIMIT #{start},#{count}
   SELECT p.*,u.`nick_name`,u.`portrait`,e.`uie_invite_code`  FROM yeshi_ec_code_publish_record p
   LEFT JOIN `yeshi_ec_user` u ON u.`id` = p.`pr_uid`
   LEFT JOIN `yeshi_ec_user_info_extra` e ON e.`uie_uid` = p.`pr_uid`
   WHERE TIMESTAMPDIFF(SECOND,p.`pr_create_time`,NOW())<![CDATA[<]]> #{validTime}
   ORDER BY p.`pr_create_time` DESC
   LIMIT #{start},#{count}
  </select>
  
  <select id="countValid" resultType="Long">
      SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
    WHERE  DATE_SUB(CURDATE(), INTERVAL 3 DAY) <![CDATA[<]]> DATE(pr_create_time)
   SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
   WHERE TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]> #{validTime}
  </select>
  
  <select id="countValidRecord" resultType="Long">
      SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
    WHERE  DATE_SUB(CURDATE(), INTERVAL 3 DAY) <![CDATA[<]]> DATE(pr_create_time)
           AND pr_uid = #{uid}
   SELECT IFNULL(COUNT(pr_id),0) FROM yeshi_ec_code_publish_record
   WHERE  pr_uid = #{uid} AND TIMESTAMPDIFF(SECOND,`pr_create_time`,NOW())<![CDATA[<]]> #{validTime}
  </select>
  
</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java

@@ -37,14 +37,14 @@
    

    @Override

    public long countValidRecord(Long uid){

        return codePublishRecordMapper.countValidRecord(uid);

        return codePublishRecordMapper.countValidRecord(uid, CodePublishRecord.VALIDTIME);

    }

    

    

    @Override

    public List<CodePublishRecord> listValid(long start, int count) {

        

        List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count);

        List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count, CodePublishRecord.VALIDTIME);

        if (listValid == null || listValid.size() == 0) {

            return listValid;

        }

@@ -87,7 +87,7 @@


    @Override

    public long countValid() {

        return codePublishRecordMapper.countValid();

        return codePublishRecordMapper.countValid(CodePublishRecord.VALIDTIME);

    }



    


 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java

@@ -113,6 +113,11 @@
        if (exchange == null)

            throw new IntegralExchangeException(1, "兑换方式不存在");

        

        Integer state = exchange.getState();

        if (state == null || state != 1)

            throw new IntegralExchangeException(1, "兑换活动未开启");

		
		
        Integer goldCoin = exchange.getGoldCoin();

        

        ExchangeTipVO exchangeTip = new ExchangeTipVO();

@@ -190,9 +195,12 @@
        if (exchange == null)

            throw new IntegralExchangeException(1, "兑换方式不存在");



        ExchangeTypeEnum type = exchange.getType();

        Integer state = exchange.getState();

        if (state == null || state != 1)

            throw new IntegralExchangeException(1, "兑换活动未开启");

        

        long exchangeCount = 0;

        ExchangeTypeEnum type = exchange.getType();

        if (ExchangeTypeEnum.freeCouponBuy == type) {

            exchangeCount = integralExchangeRecordService.countRecordByUid(id, uid, null);

            if (exchangeCount >= 1) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java

@@ -473,7 +473,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'bindWeiXin-'+#uid", time = 30)

    @Async()

    @Override

    public void addBindWeiXin(Long uid) {

@@ -485,7 +484,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'bindPhone-'+#uid", time = 30)

    @Async()

    @Override

    public void addBindPhone(Long uid) {

@@ -497,7 +495,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'bindTaoBao-'+#uid", time = 30)

    @Async()

    @Override

    public void addBindTaoBao(Long uid) {

@@ -509,7 +506,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'setWeiXinNum-'+#uid", time = 30)

    @Async()

    @Override

    public void addSetWeiXinNum(Long uid) {

@@ -521,7 +517,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'setGender-'+#uid", time = 30)

    @Async()

    @Override

    public void addSetGender(Long uid) {

@@ -533,7 +528,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'setPortrait-'+#uid", time = 30)

    @Async()

    @Override

    public void addSetPortrait(Long uid) {

@@ -545,7 +539,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'setNickName-'+#uid", time = 30)

    @Async()

    @Override

    public void addSetNickname(Long uid) {

@@ -557,7 +550,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'bindAlipay-'+#uid", time = 30)

    @Async()

    @Override

    public void addBindAlipay(Long uid) {

@@ -569,7 +561,6 @@
    }



    @IntegralGetVersionLimit(uid = "#uid")

    @IntegralGetFrequencyLimit(key = "'inviteActivate-'+#uid", time = 30)

    @Async()

    @Override

    public void addInviteActivate(Long uid) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -667,6 +667,23 @@
    }

    

    

    @Override

    public long countUsableRewardCoupon (Long uid) {

        if (uid == null) 
            return 0;

		
        List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();

        if (couponList == null || couponList.size() == 0)

            return 0;

		
        List<Long> listCouponId = new ArrayList<Long>();

        for (SystemCoupon systemCoupon : couponList) {

            listCouponId.add(systemCoupon.getId());

        }

		
        return userSystemCouponMapper.countUsableByUid(uid, listCouponId);

    }

	
    

    @Transactional

    @Override


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java

@@ -293,5 +293,12 @@
     * @return

     */

    public long countUsableFreeCouponForBuy(Long uid);

	
    /**

     * 统计可使用的奖励券

     * @param uid

     * @return

     */

    public long countUsableRewardCoupon(Long uid);



}