caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2021-08-12 00:29:11 +08:00
commit 522ca6f157
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
View File

@ -229,6 +229,7 @@ public class Goods extends BaseEntity {
//如果立即上架则 //如果立即上架则
this.marketEnable = goodsOperationDTO.getRelease() ? GoodsStatusEnum.UPPER.name() : GoodsStatusEnum.DOWN.name(); this.marketEnable = goodsOperationDTO.getRelease() ? GoodsStatusEnum.UPPER.name() : GoodsStatusEnum.DOWN.name();
this.goodsType = goodsOperationDTO.getGoodsType(); this.goodsType = goodsOperationDTO.getGoodsType();
this.grade = 100D;
//循环sku，判定sku是否有效 //循环sku，判定sku是否有效
for (Map<String, Object> sku : goodsOperationDTO.getSkuList()) { for (Map<String, Object> sku : goodsOperationDTO.getSkuList()) {

1
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
View File

@ -588,6 +588,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
sku.setIntro(goods.getIntro()); sku.setIntro(goods.getIntro());
sku.setMobileIntro(goods.getMobileIntro()); sku.setMobileIntro(goods.getMobileIntro());
sku.setGoodsUnit(goods.getGoodsUnit()); sku.setGoodsUnit(goods.getGoodsUnit());
sku.setGrade(100D);
//商品状态 //商品状态
sku.setIsAuth(goods.getIsAuth()); sku.setIsAuth(goods.getIsAuth());
sku.setSalesModel(goods.getSalesModel()); sku.setSalesModel(goods.getSalesModel());

2
framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java
View File

@ -91,7 +91,7 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
Map<String, String> params = new HashMap<String, String>(8); Map<String, String> params = new HashMap<String, String>(8);
params.put("RequestData", urlEncoder(requestData, "UTF-8")); params.put("RequestData", urlEncoder(requestData, "UTF-8"));
params.put("EBusinessID", EBusinessID); params.put("EBusinessID", EBusinessID);
params.put("RequestType", "8001"); params.put("RequestType", "1002");
String dataSign = encrypt(requestData, AppKey, "UTF-8"); String dataSign = encrypt(requestData, AppKey, "UTF-8");
params.put("DataSign", urlEncoder(dataSign, "UTF-8")); params.put("DataSign", urlEncoder(dataSign, "UTF-8"));
params.put("DataType", "2"); params.put("DataType", "2");