Browse Source

订单调整

v1.0
Yen 2 years ago
parent
commit
23d42a4d34
  1. 3
      src/main/java/com/qs/serve/modules/goods/mapper/GoodsSkuMapper.java
  2. 2
      src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java
  3. 10
      src/main/java/com/qs/serve/modules/goods/service/GoodsSpuService.java
  4. 5
      src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
  5. 63
      src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java
  6. 4
      src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java
  7. 10
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java
  8. 7
      src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
  9. 11
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
  10. 21
      src/main/java/com/qs/serve/modules/third/PortalGoodsController.java
  11. 17
      src/main/java/com/qs/serve/modules/third/entity/GoodsToSkuParam.java
  12. 4
      src/main/resources/mapper/goods/GoodsSkuMapper.xml

3
src/main/java/com/qs/serve/modules/goods/mapper/GoodsSkuMapper.java

@ -15,6 +15,9 @@ import java.util.List;
*/ */
public interface GoodsSkuMapper extends BaseMapper<GoodsSku> { public interface GoodsSkuMapper extends BaseMapper<GoodsSku> {
List<String> getBelongStringList();
/** /**
* 查询vo * 查询vo
* @param goodsSku * @param goodsSku

2
src/main/java/com/qs/serve/modules/goods/service/GoodsSkuService.java

@ -15,6 +15,8 @@ import java.util.List;
*/ */
public interface GoodsSkuService extends IService<GoodsSku> { public interface GoodsSkuService extends IService<GoodsSku> {
List<String> getBelongPlace();
GoodsSku getByCode(String code); GoodsSku getByCode(String code);
List<GoodsSku> getByCodes(List<String> codes); List<GoodsSku> getByCodes(List<String> codes);

10
src/main/java/com/qs/serve/modules/goods/service/GoodsSpuService.java

@ -36,7 +36,15 @@ public interface GoodsSpuService extends IService<GoodsSpu> {
GoodSkuBatchResult editTasteBo(GoodsSpuTasteBo tasteProduct); GoodSkuBatchResult editTasteBo(GoodsSpuTasteBo tasteProduct);
List<OmsSpuToSkuKey> getSpuToSkuInfo(String book, List<String> skuCodes); List<GoodsSpu> selectListBySpuCodes(List<String> spuCodes);
/**
*
* @param placeName
* @param spuCodes
* @return
*/
List<OmsSpuToSkuKey> getSpuToSkuInfo(String placeName, List<String> spuCodes);
} }

5
src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@ -44,6 +44,11 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
private GoodsSpecValueService goodsSpecValueService; private GoodsSpecValueService goodsSpecValueService;
private SeeYonRequestBaseService seeYonRequestBaseService; private SeeYonRequestBaseService seeYonRequestBaseService;
@Override
public List<String> getBelongPlace() {
return null;
}
@Override @Override
public GoodsSku getByCode(String code) { public GoodsSku getByCode(String code) {
LambdaQueryWrapper<GoodsSku> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GoodsSku> lqw = new LambdaQueryWrapper<>();

63
src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java

@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* spu 服务实现类 * spu 服务实现类
@ -253,20 +254,64 @@ public class GoodsSpuServiceImpl extends ServiceImpl<GoodsSpuMapper,GoodsSpu> im
return skuBatchResult; return skuBatchResult;
} }
@Override
public List<GoodsSpu> selectListBySpuCodes(List<String> spuCodes) {
return null;
}
/** /**
* 根据账套获取spu对应的sku * 根据账套获取spu对应的sku
* @param book 账套 * @param placeName 账套
* @param skuCodes 嘉士利的SKU-CODE * @param spuCodes 嘉士利的SKU-CODE
* @return 嘉士利的invCode * @return 嘉士利的invCode
*/ */
@Override @Override
public List<OmsSpuToSkuKey> getSpuToSkuInfo(String book, List<String> skuCodes){ public List<OmsSpuToSkuKey> getSpuToSkuInfo(String placeName, List<String> spuCodes){
Map<String,Object> params = new HashMap<>();
params.put("book",book); //取消调用远程接口
params.put("skuCode",skuCodes); // Map<String,Object> params = new HashMap<>();
String apiUrl = projectApisProperties.getSpuToSku(); // params.put("book",book);
String response = HttpUtil.doPost(apiUrl, JsonUtil.objectToJson(params),null); // params.put("skuCode",skuCodes);
return JsonUtil.jsonToList(response,OmsSpuToSkuKey.class); // String apiUrl = projectApisProperties.getSpuToSku();
// String response = HttpUtil.doPost(apiUrl, JsonUtil.objectToJson(params),null);
// return JsonUtil.jsonToList(response,OmsSpuToSkuKey.class);
if(spuCodes.size()<1){
return new ArrayList<>();
}
List<GoodsSpu> spuList = this.selectListBySpuCodes(spuCodes);
if(spuList.size()<1){
return new ArrayList<>();
}
List<Long> spuIds = spuList.stream().map(GoodsSpu::getId).collect(Collectors.toList());
LambdaQueryWrapper<GoodsSku> skuLqw = new LambdaQueryWrapper<>();
skuLqw.eq(GoodsSku::getBelong,placeName);
skuLqw.in(GoodsSku::getSpuId,spuIds);
List<GoodsSku> goodsSkus = goodsSkuService.list(skuLqw);
List<OmsSpuToSkuKey> skuKeys = new ArrayList<>();
for (GoodsSku sku : goodsSkus) {
GoodsSpu currSpu = null;
for (GoodsSpu goodsSpu : spuList) {
if(sku.getSpuId().equals(goodsSpu.getId())){
currSpu = goodsSpu;
break;
}
}
OmsSpuToSkuKey skuKey = new OmsSpuToSkuKey();
skuKey.setSkuCode(currSpu.getSpuCode());
skuKey.setInvCode(sku.getSkuCode());
skuKey.setWeight(sku.getWeight().toString());
skuKey.setVolume(sku.getVolume().toString());
skuKeys.add(skuKey);
}
return skuKeys;
} }
/** /**

4
src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java

@ -154,8 +154,10 @@ public class PayPayment implements Serializable {
@JsonProperty @JsonProperty
private String delFlag; private String delFlag;
//private Integer syncActFlag;
/** 同步标识 */ /** 同步标识 */
private Integer syncActFlag; private Integer syncCostFlag;
} }

10
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java

@ -62,6 +62,16 @@ public class TbsCostTodoController {
public R<List<TbsCostTodo>> getList(TbsCostTodo param){ public R<List<TbsCostTodo>> getList(TbsCostTodo param){
LambdaQueryWrapper<TbsCostTodo> lqw = new LambdaQueryWrapper<>(param); LambdaQueryWrapper<TbsCostTodo> lqw = new LambdaQueryWrapper<>(param);
List<TbsCostTodo> list = tbsCostTodoService.list(lqw); List<TbsCostTodo> list = tbsCostTodoService.list(lqw);
for (TbsCostTodo tbsCostTodo : list) {
if(tbsCostTodo.getAttachIds()!=null&&tbsCostTodo.getAttachIds().length>0){
List list2 = attachService.listByIds(Arrays.asList(tbsCostTodo.getAttachIds()));
tbsCostTodo.setAttachList(list2);
}
if(tbsCostTodo.getAttachIds2()!=null&&tbsCostTodo.getAttachIds2().length>0){
List list2 = attachService.listByIds(Arrays.asList(tbsCostTodo.getAttachIds2()));
tbsCostTodo.setAttachList2(list2);
}
}
return R.ok(list); return R.ok(list);
} }

7
src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java

@ -81,6 +81,7 @@ public class TbsCostApply implements Serializable {
* 1-已通过代表这个案子的所有活动都已经核销完成 * 1-已通过代表这个案子的所有活动都已经核销完成
* 2-核销中代表这个案子的某些活动在核销中 * 2-核销中代表这个案子的某些活动在核销中
* 3-被拒绝代表这个案子里面的所有活动金额都被释放了 * 3-被拒绝代表这个案子里面的所有活动金额都被释放了
* 4-部分核销部分已核销还有未完成部分
*/ */
private Integer checkState; private Integer checkState;
@ -221,6 +222,12 @@ public class TbsCostApply implements Serializable {
private String extUserCode; private String extUserCode;
private String extUserName; private String extUserName;
/** 支付状态: 0->未支付;1->部分支付;2->已支付 */
private Integer payStatus;
/** 验收状态: 0->未验收;1-验收中;2-部分验收;3完成 */
private Integer agreeCheckStatus;
@TableField(exist = false) @TableField(exist = false)
private String affairId; private String affairId;

11
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@ -1113,6 +1113,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
} }
} }
boolean isAllCancel = true; boolean isAllCancel = true;
boolean someActChecked = false;
boolean someActNotChecked = false;
for (TbsActivity activity : activityList) { for (TbsActivity activity : activityList) {
boolean itemCancel = activity.getReleaseFlag().equals(1) boolean itemCancel = activity.getReleaseFlag().equals(1)
&& activity.getReleaseAmount()!=null && activity.getReleaseAmount()!=null
@ -1121,13 +1123,22 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
isAllCancel = false; isAllCancel = false;
break; break;
} }
if(activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
someActChecked = true;
}
if(!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
someActNotChecked = true;
}
} }
boolean isChecked = someActChecked&&someActNotChecked;
TbsCostApply costApply = new TbsCostApply(); TbsCostApply costApply = new TbsCostApply();
costApply.setId(costApplyId); costApply.setId(costApplyId);
costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode()); costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
if(isAllCancel){ if(isAllCancel){
costApply.setCheckState(3); costApply.setCheckState(3);
}else if (isChecked){
costApply.setCheckState(4);
}else { }else {
costApply.setCheckState(1); costApply.setCheckState(1);
} }

21
src/main/java/com/qs/serve/modules/third/PortalGoodsController.java

@ -6,6 +6,7 @@ import com.qs.serve.modules.goods.entity.GoodsSpu;
import com.qs.serve.modules.goods.service.GoodsSkuService; import com.qs.serve.modules.goods.service.GoodsSkuService;
import com.qs.serve.modules.goods.service.GoodsSpuService; import com.qs.serve.modules.goods.service.GoodsSpuService;
import com.qs.serve.modules.oms.entity.dto.OmsSpuToSkuKey; import com.qs.serve.modules.oms.entity.dto.OmsSpuToSkuKey;
import com.qs.serve.modules.third.entity.GoodsToSkuParam;
import com.qs.serve.modules.third.entity.param.SkuToGetSpuParam; import com.qs.serve.modules.third.entity.param.SkuToGetSpuParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -50,4 +51,24 @@ public class PortalGoodsController {
return rs; return rs;
} }
/**
* 通过invCode获取spuCode
* @param param
* @return
*/
@PostMapping("matchInvCode")
public List<OmsSpuToSkuKey> matchInvCode(@RequestBody GoodsToSkuParam param){
return goodsSpuService.getSpuToSkuInfo(param.getPlaceName(), param.getSpuCodes());
}
/**
* 通过invCode获取spuCode
* @return
*/
@PostMapping("belongPlace")
public List<?> getSpuBySku(){
return goodsSkuService.getBelongPlace();
}
} }

17
src/main/java/com/qs/serve/modules/third/entity/GoodsToSkuParam.java

@ -0,0 +1,17 @@
package com.qs.serve.modules.third.entity;
import lombok.Data;
import java.util.List;
/**
* @author YenHex
* @since 2023/11/6
*/
@Data
public class GoodsToSkuParam {
String placeName;
List<String> spuCodes;
}

4
src/main/resources/mapper/goods/GoodsSkuMapper.xml

@ -161,4 +161,8 @@
</foreach> </foreach>
</select> </select>
<select id="getBelongStringList" resultType="java.lang.String">
SELECT `belong` FROM `goods_sku` where `belong` is not null GROUP BY `belong`
</select>
</mapper> </mapper>

Loading…
Cancel
Save