Merge remote-tracking branch '群晖/master'
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package cn.van.business.util;
|
package cn.van.business.util;
|
||||||
|
|
||||||
|
|
||||||
import cn.hutool.http.HttpRequest;
|
import cn.hutool.http.HttpRequest;
|
||||||
import cn.hutool.http.HttpResponse;
|
import cn.hutool.http.HttpResponse;
|
||||||
import cn.van.business.model.cj.XbMessage;
|
import cn.van.business.model.cj.XbMessage;
|
||||||
@@ -21,7 +20,6 @@ import com.jd.open.api.sdk.JdClient;
|
|||||||
import com.jd.open.api.sdk.domain.kplunion.CouponService.request.get.CreateGiftCouponReq;
|
import com.jd.open.api.sdk.domain.kplunion.CouponService.request.get.CreateGiftCouponReq;
|
||||||
import com.jd.open.api.sdk.domain.kplunion.GoodsService.request.query.GoodsReq;
|
import com.jd.open.api.sdk.domain.kplunion.GoodsService.request.query.GoodsReq;
|
||||||
import com.jd.open.api.sdk.domain.kplunion.GoodsService.response.query.GoodsQueryResult;
|
import com.jd.open.api.sdk.domain.kplunion.GoodsService.response.query.GoodsQueryResult;
|
||||||
import com.jd.open.api.sdk.domain.kplunion.GoodsService.response.query.UrlInfo;
|
|
||||||
import com.jd.open.api.sdk.domain.kplunion.promotionbysubunioni.PromotionService.request.get.PromotionCodeReq;
|
import com.jd.open.api.sdk.domain.kplunion.promotionbysubunioni.PromotionService.request.get.PromotionCodeReq;
|
||||||
import com.jd.open.api.sdk.request.kplunion.UnionOpenCouponGiftGetRequest;
|
import com.jd.open.api.sdk.request.kplunion.UnionOpenCouponGiftGetRequest;
|
||||||
import com.jd.open.api.sdk.request.kplunion.UnionOpenGoodsQueryRequest;
|
import com.jd.open.api.sdk.request.kplunion.UnionOpenGoodsQueryRequest;
|
||||||
@@ -31,6 +29,7 @@ import com.jd.open.api.sdk.response.kplunion.UnionOpenGoodsQueryResponse;
|
|||||||
import com.jd.open.api.sdk.response.kplunion.UnionOpenPromotionBysubunionidGetResponse;
|
import com.jd.open.api.sdk.response.kplunion.UnionOpenPromotionBysubunionidGetResponse;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -66,9 +65,13 @@ import static cn.van.business.util.WXUtil.*;
|
|||||||
* @description:
|
* @description:
|
||||||
*/
|
*/
|
||||||
@Component
|
@Component
|
||||||
|
@Slf4j
|
||||||
public class JDUtil {
|
public class JDUtil {
|
||||||
|
|
||||||
static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||||
/**
|
/**
|
||||||
|
* static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||||
|
* /**
|
||||||
* 密钥配置
|
* 密钥配置
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -1420,10 +1423,10 @@ public class JDUtil {
|
|||||||
finallyMessage.put("priceList", priceList);
|
finallyMessage.put("priceList", priceList);
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
}
|
}
|
||||||
}else {
|
} else {
|
||||||
XbMessage xbMessage = new XbMessage();
|
XbMessage xbMessage = new XbMessage();
|
||||||
xbMessage.setCreateDate(LocalDate.now());
|
xbMessage.setCreateDate(LocalDate.now());
|
||||||
xbMessage.setTipOriginalMessage( message);
|
xbMessage.setTipOriginalMessage(message);
|
||||||
xbMessage = xbMessageRepository.save(xbMessage);
|
xbMessage = xbMessageRepository.save(xbMessage);
|
||||||
xbMessageId = xbMessage.getId();
|
xbMessageId = xbMessage.getId();
|
||||||
}
|
}
|
||||||
@@ -1440,11 +1443,11 @@ public class JDUtil {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
long totalCount = productInfo.getTotalCount();
|
long totalCount = productInfo.getTotalCount();
|
||||||
if (isCj){
|
if (isCj) {
|
||||||
if (totalCount == 0){
|
if (totalCount == 0) {
|
||||||
// 优惠券
|
// 优惠券
|
||||||
}else {
|
} else {
|
||||||
// 商品信息
|
// 商品信息
|
||||||
XbMessageItem xbMessageItem = new XbMessageItem();
|
XbMessageItem xbMessageItem = new XbMessageItem();
|
||||||
xbMessageItem.setCreateDate(LocalDate.now());
|
xbMessageItem.setCreateDate(LocalDate.now());
|
||||||
xbMessageItem.setXbMessageId(String.valueOf(xbMessageId));
|
xbMessageItem.setXbMessageId(String.valueOf(xbMessageId));
|
||||||
@@ -1578,7 +1581,8 @@ public class JDUtil {
|
|||||||
return finallyMessage;
|
return finallyMessage;
|
||||||
|
|
||||||
}
|
}
|
||||||
private void cjToDB(){
|
|
||||||
|
private void cjToDB() {
|
||||||
new Date();
|
new Date();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user