Merge branch 'pre' into 'master'

Pre

See merge request !95

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -137,7 +137,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         linkedMultiValueMap.add("notifyUrl", notifyUrl);
         linkedMultiValueMap.add("orderCode", memberOrder.getOrderNo());
         linkedMultiValueMap.add("orderRefundCode", refundNo);
-        linkedMultiValueMap.add("paymentId", null);
+        linkedMultiValueMap.add("paymentId", memberOrder.getPaymentId());
         linkedMultiValueMap.add("paymentType", (memberOrder.getDeviceFrom() + memberOrder.getPayType()).toUpperCase());
         linkedMultiValueMap.add("price", String.valueOf(param.getRefundAmt()));
         linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java

@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.service.ICandyCouponService;
+import com.liquidnet.service.candy.util.ObjectUtil;
 import com.liquidnet.service.candy.vo.CandyCouponPreVo;
 import com.liquidnet.service.candy.vo.CandyCouponVo;
 import com.liquidnet.service.candy.vo.CandyMyCouponListVo;
@@ -52,8 +53,24 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "Integer", name = "type", value = "类型 1可用 2过期/已使用 ", required = true),
     })
-    public ResponseDto<CandyMyCouponListVo> myCoupon(@RequestParam("type") @NotNull Integer type) {
-        return ResponseDto.success(candyCouponService.myCoupon(type));
+    public ResponseDto<CandyMyCouponListVo> myCoupon(@RequestParam("type") @NotNull Integer type, @RequestParam(required = false, name = "page") Integer page) {
+        CandyMyCouponListVo vo = candyCouponService.myCoupon(type);
+//        List<CandyCouponVo> list = vo.getMyCoupon();
+//        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+//        if (page == null || page == 0) {
+//            page = 1;
+//        }
+//        int size = 40;
+//        int initSize = (page - 1) * size;
+//        int forSize = page * size;
+//        if (forSize >= list.size()) {
+//            forSize = list.size();
+//        }
+//        for (int i = initSize; i < forSize; i++) {
+//            listVo.add(list.get(i));
+//        }
+//        vo.setMyCoupon(listVo);
+        return ResponseDto.success(vo);
     }
 
     //我的会员权益券统计
@@ -87,8 +104,25 @@ public class CandyCouponController {
                                                                     @RequestParam("performanceId") @NotNull @NotBlank String performanceId,
                                                                     @RequestParam("timeId") @NotNull @NotBlank String timeId,
                                                                     @RequestParam("ticketId") @NotNull @NotBlank String ticketId,
-                                                                    @RequestParam("type") @NotNull Integer type) {
-        return ResponseDto.success(candyCouponService.preUsePerformanceCoupon(priceTotal, performanceId, timeId, ticketId, type));
+                                                                    @RequestParam("type") @NotNull Integer type,
+                                                                    @RequestParam(required = false, name = "page") Integer page) {
+        CandyMyCouponListVo vo = candyCouponService.preUsePerformanceCoupon(priceTotal, performanceId, timeId, ticketId, type);
+        List<CandyCouponVo> list = vo.getMyCoupon();
+        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        int size = 10;
+        int initSize = (page - 1) * size;
+        int forSize = page * size;
+        if (forSize >= list.size()) {
+            forSize = list.size();
+        }
+        for (int i = initSize; i < forSize; i++) {
+            listVo.add(list.get(i));
+        }
+        vo.setMyCoupon(listVo);
+        return ResponseDto.success(vo);
     }
 
     // 是否可用券演出
@@ -120,8 +154,25 @@ public class CandyCouponController {
     })
     public ResponseDto<CandyMyCouponListVo> preUseGoodCoupon(@RequestParam("priceTotal") @NotNull BigDecimal priceTotal,
                                                              @RequestParam("goodId") @NotNull @NotBlank String goodId,
-                                                             @RequestParam("type") @NotNull Integer type) {
-        return ResponseDto.success(candyCouponService.preUseGoodCoupon(priceTotal, goodId, type));
+                                                             @RequestParam("type") @NotNull Integer type,
+                                                             @RequestParam(required = false, name = "page") Integer page) {
+        CandyMyCouponListVo vo = candyCouponService.preUseGoodCoupon(priceTotal, goodId, type);
+        List<CandyCouponVo> list = vo.getMyCoupon();
+        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        int size = 10;
+        int initSize = (page - 1) * size;
+        int forSize = page * size;
+        if (forSize >= list.size()) {
+            forSize = list.size();
+        }
+        for (int i = initSize; i < forSize; i++) {
+            listVo.add(list.get(i));
+        }
+        vo.setMyCoupon(listVo);
+        return ResponseDto.success(vo);
     }
 
     //是否可用券 - 商品
@@ -145,8 +196,24 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "performanceId", value = "演出id", required = true)
     })
-    public ResponseDto<List<CandyCouponVo>> myAdvanceCoupon(@RequestParam("performanceId") @NotNull @NotBlank String performanceId) {
-        return ResponseDto.success(candyCouponService.myAdvanceCoupon(performanceId));
+    public ResponseDto<List<CandyCouponVo>> myAdvanceCoupon(@RequestParam("performanceId") @NotNull @NotBlank String performanceId,
+                                                            @RequestParam(required = false, name = "page") Integer page) {
+        List<CandyCouponVo> list = candyCouponService.myAdvanceCoupon(performanceId);
+        List<CandyCouponVo> listVo = ObjectUtil.getCandyCouponVoArrayList();
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        int size = 10;
+        int initSize = (page - 1) * size;
+        int forSize = page * size;
+        if (forSize >= list.size()) {
+            forSize = list.size();
+        }
+
+        for (int i = initSize; i < forSize; i++) {
+            listVo.add(list.get(i));
+        }
+        return ResponseDto.success();
     }
 
 //    //判断券是否可用
@@ -187,11 +254,11 @@ public class CandyCouponController {
                                                    @RequestParam("timeId") @NotNull @NotBlank String timeId,
                                                    @RequestParam("ticketId") @NotNull @NotBlank String ticketId
     ) {
-        CandyUseResultVo result = candyCouponService.useCoupon(uCouponId, content, totalPrice, performanceId, timeId,ticketId, goodId);
+        CandyUseResultVo result = candyCouponService.useCoupon(uCouponId, content, totalPrice, performanceId, timeId, ticketId, goodId);
         if (result == null) {
             return ResponseDto.failure();
         }
-        result.setValue(result.getValue().setScale(2,BigDecimal.ROUND_HALF_UP));
+        result.setValue(result.getValue().setScale(2, BigDecimal.ROUND_HALF_UP));
         return ResponseDto.success(result);
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -20,6 +20,7 @@ import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
@@ -133,45 +134,52 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 syncVo = redisUtil.set(umKey, userMemberVo);
                 log.info("###会员退款回调处理成功:更新REDIS会员信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
-                removeUcouponIdList = userCouponBasicDtoList.stream()
-                        .filter(r -> (r.getExclusive() == 1 && r.getDuedAt().compareTo(expiryAt) == 0))
-                        .map(CandyUserCouponBasicDto::getUcouponId)
-                        .collect(Collectors.toList());
+                // 同步更新MYSQL会员信息
+                AdamUserMember updateInfoUserMember = new AdamUserMember();
+                updateInfoUserMember.setExpiryAt(newExpiryAt);
+                updateInfoUserMember.setUpdatedAt(now);
+                updateInfoUserMember.setComment("R");
+                int updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
+                log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+
+                if (!CollectionUtils.isEmpty(userCouponBasicDtoList)) {
+                    removeUcouponIdList = userCouponBasicDtoList.stream()
+                            .filter(r -> (r.getExclusive() == 1 && r.getDuedAt().compareTo(expiryAt) == 0))
+                            .map(CandyUserCouponBasicDto::getUcouponId)
+                            .collect(Collectors.toList());
+                }
             } else if (userMemberVo.getState() == 2) {// 拉黑用户
-                removeUcouponIdList = userCouponBasicDtoList.stream()
-                        .filter(r -> (r.getExclusive() == 1))
-                        .map(CandyUserCouponBasicDto::getUcouponId)
-                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(userCouponBasicDtoList)) {
+                    removeUcouponIdList = userCouponBasicDtoList.stream()
+                            .filter(r -> (r.getExclusive() == 1))
+                            .map(CandyUserCouponBasicDto::getUcouponId)
+                            .collect(Collectors.toList());
+                }
             }
             // 同步删除REDIS用户会员权益券信息
-            List<String> finalRemoveUcouponIdList = removeUcouponIdList;
-            userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
-            redisUtil.set(uckey, userCouponBasicDtoList);
+            if (!CollectionUtils.isEmpty(removeUcouponIdList)) {
+                List<String> finalRemoveUcouponIdList = removeUcouponIdList;
+                userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
+                redisUtil.set(uckey, userCouponBasicDtoList);
+
+                // 同步更新MYSQL用户会员权益券信息
+                LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);
+                candyUserCouponLambdaUpdateWrapper.in(CandyUserCoupon::getUcouponId, removeUcouponIdList.toArray()).eq(CandyUserCoupon::getState, 1);
+                CandyUserCoupon updateInfoUserCoupon = new CandyUserCoupon();
+                updateInfoUserCoupon.setState(2);
+                updateInfoUserCoupon.setUpdatedAt(now);
+                updateInfoUserCoupon.setOperator("system.vip.refund");
+                int updateRst = candyUserCouponMapper.update(updateInfoUserCoupon, candyUserCouponLambdaUpdateWrapper);
+                log.info("###会员退款回调处理成功:更新DB会员权益券信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+            }
         }
-        // 同步更新MYSQL用户会员权益券信息
-        LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);
-        candyUserCouponLambdaUpdateWrapper.in(CandyUserCoupon::getUcouponId, removeUcouponIdList.toArray()).eq(CandyUserCoupon::getState, 1);
-        CandyUserCoupon updateInfoUserCoupon = new CandyUserCoupon();
-        updateInfoUserCoupon.setState(2);
-        updateInfoUserCoupon.setUpdatedAt(now);
-        updateInfoUserCoupon.setOperator("system.vip.refund");
-        int updateRst = candyUserCouponMapper.update(updateInfoUserCoupon, candyUserCouponLambdaUpdateWrapper);
-        log.info("###会员退款回调处理成功:更新DB会员权益券信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
-
-        // 同步更新MYSQL会员信息
-        AdamUserMember updateInfoUserMember = new AdamUserMember();
-        updateInfoUserMember.setExpiryAt(newExpiryAt);
-        updateInfoUserMember.setUpdatedAt(now);
-        updateInfoUserMember.setComment("R");
-        updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
-        log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
 
         // 同步更新MYSQL会员订单信息
         AdamMemberOrder updateInfoMemberOrder = new AdamMemberOrder();
         updateInfoMemberOrder.setMid(memberOrder.getMid());
         updateInfoMemberOrder.setState(5);
         updateInfoMemberOrder.setUpdatedAt(now);
-        updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
+        int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
         log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
     }
 }