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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreCouponVo.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 @ApiModel(value = "GoblinStoreCouponVo", description = "商铺活动:优惠券详情")
 @Data
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties(value = {"receiveCount"}, ignoreUnknown = true)
 public class GoblinStoreCouponVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -6233852543461320809L;
     @ApiModelProperty(position = 10, value = "卡券ID[64]")
@@ -63,6 +63,11 @@ public class GoblinStoreCouponVo implements Serializable, Cloneable {
     private LocalDateTime endTime;
 
 
+    /* ========================================================================== */
+    @ApiModelProperty(position = 27, value = "当前用户已领取数量")
+    private int receiveCount;
+
+
     private static final GoblinStoreCouponVo obj = new GoblinStoreCouponVo();
 
     public static GoblinStoreCouponVo getNew() {

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

@@ -216,9 +216,11 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         linkedMultiValueMap.add("price", price);
         linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));
         linkedMultiValueMap.add("reason", reason);
+        LinkedMultiValueMap<String, String> linkedMultiheadersMap = new LinkedMultiValueMap<>();
+        linkedMultiheadersMap.add("Accept", "application/json;charset=UTF-8");
 
         log.info("会员管理:会员订单:退款:支付中心请求参数:{}", linkedMultiValueMap);
-        String postResult = HttpUtil.post(applyUrl, linkedMultiValueMap);
+        String postResult = HttpUtil.post(applyUrl, linkedMultiValueMap, linkedMultiheadersMap);
         log.info("会员管理:会员订单:退款:支付中心返回数据:{}", postResult);
 
         JsonNode postResultJNode = JsonUtils.fromJson(postResult, JsonNode.class);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinCouponController.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -53,7 +54,21 @@ public class GoblinCouponController {
     public ResponseDto<ArrayList<GoblinStoreCouponVo>> getSpuByType(@RequestParam("spuId") @Valid String spuId,
                                                                     @RequestParam("storeId") @Valid String storeId,
                                                                     @RequestParam("type") @Valid String type) {
-        return ResponseDto.success(goblinCouponService.getSpuByType(spuId, storeId, type));
+        ArrayList<GoblinStoreCouponVo> storeCouponVos = goblinCouponService.getSpuByType(spuId, storeId, type);
+        if (!CollectionUtils.isEmpty(storeCouponVos)) {
+            String currentUid = CurrentUtil.getCurrentUid();
+            if (StringUtils.isNotEmpty(currentUid)) {
+                List<GoblinUserCouponVo> userCouponVos = goblinRedisUtils.getUserCouponVos(currentUid);
+                if (!CollectionUtils.isEmpty(userCouponVos))
+                    for (GoblinStoreCouponVo storeCouponVo : storeCouponVos)
+                        for (GoblinUserCouponVo userCouponVo : userCouponVos)
+                            if (storeCouponVo.getStoreCouponId().equals(userCouponVo.getStoreCouponId())) {
+                                storeCouponVo.setReceiveCount(storeCouponVo.getReceiveCount() + 1);
+                                break;
+                            }
+            }
+        }
+        return ResponseDto.success(storeCouponVos);
     }
 
     @PostMapping("receive")