yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 12 months ago
parent
462764bbdc 6a86f99eb5
commit
ed201fa80a
9 changed files with 167 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettle.java
  2. 186
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java
  3. 7
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java
  4. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java
  5. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java
  6. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java
  7. 4
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml
  8. 58
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
  9. 13
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/UrlQuery.java

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettle.java
View File

@ -73,8 +73,6 @@ public class AsBusrepairBillReverseSettle extends BaseEntity {
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("环节定义的sid")

186
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java
View File

@ -26,17 +26,20 @@
package com.yxt.anrui.as.biz.asbusrepairbillreversesettle;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbusrepairbill.*;
import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode;
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.*;
import com.yxt.anrui.as.api.asbusrepairbillreversesettle.flowable.*;
import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
import com.yxt.anrui.as.api.utils.AsRule;
import com.yxt.anrui.as.api.utils.domain.AsBillNo;
import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService;
import com.yxt.anrui.as.feign.flowable.flow.*;
import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign;
@ -96,7 +99,8 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private AsBusrepairBillNodeService asBusrepairBillNodeService;
private QueryWrapper<AsBusrepairBillReverseSettle> createQueryWrapper(AsBusrepairBillReverseSettleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -108,43 +112,43 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
AsBusrepairBillReverseSettleQuery query = pq.getParams();
QueryWrapper<AsBusrepairBillReverseSettle> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("s.createBySid", query.getUserSid());
} else {
PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
return p;
}
qw.orderByDesc("s.createTime");
// PrivilegeQuery privilegeQuery = new PrivilegeQuery();
// privilegeQuery.setOrgPath(query.getOrgPath());
// privilegeQuery.setMenuUrl(query.getMenuUrl());
// privilegeQuery.setUserSid(query.getUserSid());
// ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
// String orgSidPath = query.getOrgPath();
// orgSidPath = orgSidPath + "/";
// int i1 = orgSidPath.indexOf("/");
// int i2 = orgSidPath.indexOf("/", i1 + 1);
// int i3 = orgSidPath.indexOf("/", i2 + 1);
// int i4 = orgSidPath.indexOf("/", i3 + 1);
// String orgLevelKey = defaultIdReltBean.getData();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("4".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i4);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("5".equals(orgLevelKey)) {
// qw.eq("s.createBySid", query.getUserSid());
// } else {
// PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
// return p;
// }
// } else {
// PagerVo<AsBusrepairBillReverseSettleVo> p = new PagerVo<>();
// return p;
// }
// qw.orderByDesc("s.createTime");
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("s.useOrgName", query.getUseOrgName());
@ -175,7 +179,7 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
String closeDateStart = query.getCloseDateStart();
String closeDateEnd = query.getCloseDateEnd();
qw.apply(StringUtils.isNotEmpty(closeDateStart), "date_format (s.closeDate,'%Y-%m-%d') >= date_format('" + closeDateStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(closeDateEnd), "date_format (s.closeDate,'%Y-%m-%d') <= date_format('" + closeDateEnd + "','%Y-%m-%d')"
apply(StringUtils.isNotEmpty(closeDateEnd), "date_format (s.closeDate,'%Y-%m-%') <= date_format('" + closeDateEnd + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("b.customerName", query.getCustomerName());
@ -223,8 +227,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
if (null != entity) {
BeanUtil.copyProperties(entity, vo);
vo.setUseSid(entity.getCreateBySid());
vo.setOrgPath(entity.getOrgSidPath());
vo.setApplyDate(DateUtil.formatDate(entity.getApplyDate()));
if (StringUtils.isNotBlank(entity.getProcInstId())) {
vo.setInstanceId(entity.getProcInstId());
}
if (StringUtils.isNotBlank(entity.getSourceSid())) {
AsBusrepairBillDetailsVo bill = asBusrepairBillService.fetchDetailsBySid(entity.getSourceSid()).getData();
if (null != bill) {
@ -450,7 +456,6 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
}
entity.setNodeState("待提交");
entity.setCreateBySid(dto.getUseSid());
entity.setOrgSidPath(dto.getOrgPath());
baseMapper.insert(entity);
}
return sid;
@ -459,34 +464,28 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
//--------------------------flow----------------------------------
public ResultBean submit(SubmitReverseSettleDto dto) {
ResultBean rb = ResultBean.fireFail();
AsBusrepairBillReverseSettle reverseSettleApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, reverseSettleApply);
AsBusrepairBillReverseSettle reverseSettle = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, reverseSettle);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
if (StringUtils.isNotBlank(dto.getSourceSid())) {
String sourceSid = dto.getSourceSid();
int count = baseMapper.selBySourceSid(sourceSid);
if (count > 0) {
return rb.setMsg("当前工单已在反结算申请中，请勿重复提交");
}
}
//新增修改保存
String businessSid = saveReverseSettle(dto);
reverseSettleApply = fetchBySid(businessSid);
reverseSettle = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//用户的部门全路径sid
bv.setOrgSidPath(reverseSettleApply.getOrgSidPath());
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(reverseSettle.getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(reverseSettleApply.getCreateBySid());
bv.setUserSid(reverseSettle.getCreateBySid());
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
@ -500,7 +499,7 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送
reverseSettleApply = fetchBySid(businessSid);
reverseSettle = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
@ -508,7 +507,7 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("工单反结算申请");
messageFlowableQuery.setMsgContent(reverseSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(reverseSettle.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("工单反结算申请");
messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
@ -518,8 +517,8 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误：instanceId");
}
bv.setTaskId(reverseSettleApply.getTaskId());
bv.setTaskDefKey(reverseSettleApply.getNodeSid());
bv.setTaskId(reverseSettle.getTaskId());
bv.setTaskDefKey(reverseSettle.getNodeSid());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
@ -527,13 +526,13 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
return rb;
}
private synchronized int submitBusinessData(SubmitReverseSettleDto dto, AsBusrepairBillReverseSettle reverseSettleApply) {
private synchronized int submitBusinessData(SubmitReverseSettleDto dto, AsBusrepairBillReverseSettle reverseSettle) {
int r = 0;
if (StringUtils.isBlank(dto.getSid())) {
r = 1;
} else {
if (reverseSettleApply != null) {
String businessTaskId = reverseSettleApply.getTaskId();
if (reverseSettle != null) {
String businessTaskId = reverseSettle.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
@ -556,23 +555,24 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
AsBusrepairBillReverseSettle settleApply = fetchBySid(businessSid);
AsBusrepairBillReverseSettle reverseSettle = fetchBySid(businessSid);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
if (StringUtils.isBlank(settleApply.getProcDefId())) {
if (StringUtils.isBlank(reverseSettle.getProcDefId())) {
flowProcessMapQuery.setProDefKey(bv.getModelId());
} else {
flowProcessMapQuery.setProDefKey(settleApply.getProcDefId());
flowProcessMapQuery.setProDefKey(reverseSettle.getProcDefId());
}
flowProcessMapQuery.setVariables(variables);
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//=======================================
bv.setFormVariables(variables);
bv.setOrgSidPath(settleApply.getOrgSidPath());
if (bv.getTaskId().equals(settleApply.getTaskId())) {
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(reverseSettle.getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath());
if (bv.getTaskId().equals(reverseSettle.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -580,20 +580,40 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
reverseSettle = fetchBySid(businessSid);
reverseSettle.setCloseDate(new Date());
baseMapper.updateById(reverseSettle);
//退回至维修阶段
AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(reverseSettle.getSourceSid());
if (null != asBusrepairBill) {
Integer nodeCode = 3;
String nodeName = "维修";
asBusrepairBill.setNodeCode(nodeCode);
asBusrepairBill.setNodeName(nodeName);
asBusrepairBill.setNodeTime(new DateTime());
asBusrepairBillService.updateById(asBusrepairBill);
//新增工单环节信息
AsBusrepairBillNode billNode = new AsBusrepairBillNode();
billNode.setBillSid(asBusrepairBill.getSid());
billNode.setCreateByName(reverseSettle.getCreateByName());
billNode.setNodeName(nodeName);
billNode.setCreateBySid(reverseSettle.getCreateBySid());
billNode.setNodeCode(nodeCode.toString());
asBusrepairBillNodeService.insert(billNode);
}
} else {
//极光推送
settleApply = fetchBySid(businessSid);
reverseSettle = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(settleApply.getProcDefId());
ufVo.setProcInsId(settleApply.getProcInstId());
ufVo.setProcDefId(reverseSettle.getProcDefId());
ufVo.setProcInsId(reverseSettle.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("工单反结算申请");
messageFlowableQuery.setMsgContent(settleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(reverseSettle.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("工单反结算申请");
messageFeign.pushMessage(messageFlowableQuery);
}
@ -628,11 +648,11 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
public ResultBean reject(ReverseSettleTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid();
AsBusrepairBillReverseSettle reverseSettleApply = fetchBySid(businessSid);
if (reverseSettleApply == null) {
AsBusrepairBillReverseSettle reverseSettle = fetchBySid(businessSid);
if (reverseSettle == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = reverseSettleApply.getTaskId();
String businessTaskId = reverseSettle.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) {
@ -657,13 +677,13 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
reverseSettleApply = fetchBySid(businessSid);
reverseSettle = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = reverseSettleApply.getProcInstId();
String procId = reverseSettle.getProcInstId();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(reverseSettleApply.getProcDefId());
ufVo.setProcDefId(reverseSettle.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
@ -671,10 +691,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(reverseSettleApply.getCreateBySid())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(reverseSettle.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(reverseSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgContent(reverseSettle.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("工单反结算申请");
messageFeign.pushMessage(messageFlowableQuery);
@ -689,8 +709,8 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
AsBusrepairBillReverseSettle reverseSettleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = reverseSettleApply.getTaskId();
AsBusrepairBillReverseSettle reverseSettle = fetchBySid(query.getBusinessSid());
String businessTaskId = reverseSettle.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
@ -717,10 +737,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService<AsBu
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
AsBusrepairBillReverseSettle reverseSettleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = reverseSettleApply.getTaskId();
AsBusrepairBillReverseSettle reverseSettle = fetchBySid(query.getBusinessSid());
String businessTaskId = reverseSettle.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (query.getUserSid().equals(reverseSettleApply.getCreateBySid())) {
if (query.getUserSid().equals(reverseSettle.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);

7
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java
View File

@ -13,7 +13,8 @@ public class BaseGoodsSkuExtend extends BaseEntity {
private String goodsSkuSid;//商品Sku代码
private String finalPurchasePrice;//最后采购价
private String safetyStockDays;//安全库存天数
private String isOriginalFactory;//是否原厂
private String isOriginalFactory;//是否原厂 1是2否
private String isOriginalFactoryValue;//是否原厂
private String isInventoryAlert;//是否库存警戒
@TableField(value = "InventoryAlertUpperLimit")
private String inventoryAlertUpperLimit;//库存警戒上线
@ -26,9 +27,11 @@ public class BaseGoodsSkuExtend extends BaseEntity {
private String agencyPrice;//代理价
private String discount;//折扣
private String minimumSalesPrice;//最低零售价
private String isLockingSalesPrice;//是否锁定销售价
private String isLockingSalesPrice;//是否锁定销售价 1是2否
private String isLockingSalesPriceValue;//是否锁定销售价
private String isIntegralExchange;//是否可以积分兑换
private String integralAmount;//积分数量
private String sortNo;//排序
private String picUrl;//商品的图片，多个图片以‘,’分割
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java
View File

@ -34,14 +34,16 @@ public class BaseGoodsDetailsDto implements Dto {
private String manufacturerSid;//厂家sid
private String manufacturerName;//厂家名称
private String isOriginalFactory;//是否原厂 1 是 2否
private String isOriginalFactoryValue;//是否原厂 1 是 2否
private String sortNo;//排序
private String skuRemarks;//备注
private String inventoryAlertUpperLimit;//库存上限
private String inventoryAlertLowerLimit;//库存下限
private String isLockingSalesPrice;//是否锁定销售价 1 是 2否
private String isLockingSalesPriceValue;//是否锁定销售价 1 是 2否
private String minimumSalesPrice;//销售底价
private String standardPurchasePrice;//三包价格
private String agencyPrice;//首保价格
private List<String> picPath = new ArrayList<>();//商品图片
private List<UrlQuery> picPath = new ArrayList<>();//商品图片
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java
View File

@ -33,14 +33,16 @@ public class BaseGoodsDetailsVo implements Vo {
private String manufacturerSid;//厂家sid
private String manufacturerName;//厂家名称
private String isOriginalFactory;//是否原厂 1 是 2否
private String isOriginalFactoryValue;//是否原厂 1 是 2否
private String sortNo;//排序
private String skuRemarks;//备注
private String inventoryAlertUpperLimit;//库存上限
private String inventoryAlertLowerLimit;//库存下限
private String isLockingSalesPrice;//是否锁定销售价 1 是 2否
private String isLockingSalesPriceValue;//是否锁定销售价 1 是 2否
private String minimumSalesPrice;//销售底价
private String standardPurchasePrice;//三包价格
private String agencyPrice;//首保价格
private List<String> picPath = new ArrayList<>();//商品图片
private List<UrlQuery> picPath = new ArrayList<>();//商品图片
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java
View File

@ -33,7 +33,7 @@ public class BaseGoodsSpuListVo implements Vo {
private String standardPurchasePrice;//三包价格
private String agencyPrice;//首保价格
private String picUrl;
private List<String> picPath = new ArrayList<>();//商品图片
private List<UrlQuery> picPath = new ArrayList<>();//商品图片
}

4
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml
View File

@ -50,10 +50,10 @@ WHERE
p.shelfLife,
b.brandName,
m.manufacturerName,
ke.isOriginalFactory,
ke.isOriginalFactoryValue,
ke.InventoryAlertUpperLimit,
ke.InventoryAlertLowerLimit,
ke.isLockingSalesPrice,
ke.isLockingSalesPriceValue,
ke.minimumSalesPrice,
ke.standardPurchasePrice,
ke.agencyPrice,

58
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
View File

@ -227,11 +227,13 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (BaseGoodsSpuListVo record : records) {
if (StringUtils.isNotBlank(record.getPicUrl())) {
List<String> files = new ArrayList<>();
List<UrlQuery> files = new ArrayList<>();
String picUrl = record.getPicUrl();
String[] split = picUrl.split(",");
for (String s : split) {
files.add(urlPrefix + s);
UrlQuery urlQuery = new UrlQuery();
urlQuery.setUrl(urlPrefix + s);
files.add(urlQuery);
}
record.setPicPath(files);
}
@ -279,13 +281,16 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
if (StringUtils.isNotBlank(dto.getSkuRemarks())) {
skuExtendUpdate.setRemarks(dto.getSkuRemarks());
}
List<String> picPath = dto.getPicPath();
List<UrlQuery> picPath = dto.getPicPath();
if (!picPath.isEmpty()) {
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : picPath) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
for (UrlQuery urlQuery : picPath) {
if (StringUtils.isNotBlank(urlQuery.getUrl())) {
String filePath = urlQuery.getUrl();
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
}
}
sb.delete(sb.length() - 1, sb.length());
skuExtendUpdate.setPicUrl(sb.toString());
@ -298,16 +303,19 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
if (StringUtils.isNotBlank(dto.getSkuRemarks())) {
skuExtend.setRemarks(dto.getSkuRemarks());
}
List<String> picPath = dto.getPicPath();
List<UrlQuery> picPath = dto.getPicPath();
if (!picPath.isEmpty()) {
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : picPath) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
for (UrlQuery urlQuery : picPath) {
if (StringUtils.isNotBlank(urlQuery.getUrl())) {
String filePath = urlQuery.getUrl();
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
}
}
sb.delete(sb.length() - 1, sb.length());
skuExtend.setPicUrl(sb.toString());
skuExtendUpdate.setPicUrl(sb.toString());
}
baseGoodsSkuExtendService.insert(skuExtend);
}
@ -332,13 +340,16 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
if (StringUtils.isNotBlank(dto.getSkuRemarks())) {
skuExtend.setRemarks(dto.getSkuRemarks());
}
List<String> picPath = dto.getPicPath();
List<UrlQuery> picPath = dto.getPicPath();
if (!picPath.isEmpty()) {
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : picPath) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
for (UrlQuery urlQuery : picPath) {
if (StringUtils.isNotBlank(urlQuery.getUrl())) {
String filePath = urlQuery.getUrl();
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
}
}
sb.delete(sb.length() - 1, sb.length());
skuExtend.setPicUrl(sb.toString());
@ -404,13 +415,16 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
if (StringUtils.isNotBlank(dto.getSkuRemarks())) {
skuExtend.setRemarks(dto.getSkuRemarks());
}
List<String> picPath = dto.getPicPath();
List<UrlQuery> picPath = dto.getPicPath();
if (!picPath.isEmpty()) {
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : picPath) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
for (UrlQuery urlQuery : picPath) {
if (StringUtils.isNotBlank(urlQuery.getUrl())) {
String filePath = urlQuery.getUrl();
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
}
}
sb.delete(sb.length() - 1, sb.length());
skuExtend.setPicUrl(sb.toString());
@ -464,11 +478,13 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
}
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (StringUtils.isNotBlank(skuExtend.getPicUrl())) {
List<String> files = new ArrayList<>();
List<UrlQuery> files = new ArrayList<>();
String picUrl = skuExtend.getPicUrl();
String[] split = picUrl.split(",");
for (String s : split) {
files.add(urlPrefix + s);
UrlQuery urlQuery = new UrlQuery();
urlQuery.setUrl(urlPrefix + s);
files.add(urlQuery);
}
vo.setPicPath(files);
}

13
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/UrlQuery.java
View File

@ -0,0 +1,13 @@
package com.yxt.base.biz.base.basegoodsspu;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/16 10:00
*/
@Data
public class UrlQuery {
private String url;
}
Write Preview
Loading…
Cancel
Save