xioayue
/
szwh
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改代码

master
xyiege 3 years ago
parent
6120f7c7ed
commit
ffb8c7e2e6
1 changed files with 44 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java

87
src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
View File

@ -38,23 +38,23 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
//获取接口数据 //获取接口数据
JSONObject recvjson = SzwhApiUtils.revocationGoods(); JSONObject recvjson = SzwhApiUtils.revocationGoods();
//提取返回数据中的data 字段 //提取返回数据中的data 字段
String datajsonStr= recvjson.getString("data"); String datajsonStr = recvjson.getString("data");
if(StringUtils.isNotBlank(datajsonStr)){ if (StringUtils.isNotBlank(datajsonStr)) {
JSONArray jsonArray = JSONArray.parseArray(datajsonStr); JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
for(int i=0;i<jsonArray.size();i++){ for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jitem = (JSONObject) jsonArray.get(i); JSONObject jitem = (JSONObject) jsonArray.get(i);
String islicode = jitem.getString("isliCode"); String islicode = jitem.getString("isliCode");
//查询是否存在商品 //查询是否存在商品
Goods dbgoods =goodsMapper.getGoodsByIsliCode(islicode); Goods dbgoods = goodsMapper.getGoodsByIsliCode(islicode);
// 如果商品存在，执行撤销操作 // 如果商品存在，执行撤销操作
if(dbgoods!=null && dbgoods.getApplyOut()==0){ if (dbgoods != null && dbgoods.getApplyOut() == 0) {
//更新状态 //更新状态
goodsMapper.updateRevocationGoods(dbgoods.getId().toString()); goodsMapper.updateRevocationGoods(dbgoods.getId().toString());
//构建操作日志 //构建操作日志
OperationLog oplog = new OperationLog(); OperationLog oplog = new OperationLog();
oplog.setType("goods"); oplog.setType("goods");
oplog.setLogid(dbgoods.getId()); oplog.setLogid(dbgoods.getId());
oplog.setMessage(sdf.format(new Date())+" 发布投送系统撤销委托"); oplog.setMessage(sdf.format(new Date()) + " 发布投送系统撤销委托");
operationLogMapper.addLog(oplog); operationLogMapper.addLog(oplog);
} }
} }
@ -70,68 +70,69 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
// 接口查询撤销数据 // 接口查询撤销数据
JSONObject recvjson = SzwhApiUtils.queryGoodsStatus(); JSONObject recvjson = SzwhApiUtils.queryGoodsStatus();
//提取返回数据中的data 字段 //提取返回数据中的data 字段
String datajsonStr= recvjson.getString("data"); String datajsonStr = recvjson.getString("data");
if(StringUtils.isNotBlank(datajsonStr)){ if (StringUtils.isNotBlank(datajsonStr)) {
JSONArray jsonArray = JSONArray.parseArray(datajsonStr); JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
for(int i=0;i<jsonArray.size();i++){ for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jitem = (JSONObject) jsonArray.get(i); JSONObject jitem = (JSONObject) jsonArray.get(i);
String islicode = jitem.getString("isliCode"); String islicode = jitem.getString("isliCode");
//1:委托自己撤销,2:交易撤销 //1:委托自己撤销,2:交易撤销
int revokeStatus= jitem.getInteger("revokeStatus"); int revokeStatus = jitem.getInteger("revokeStatus");
//审核状态：0,未审核,1，通过；2，不通过 //审核状态：0,未审核,1，通过；2，不通过
int verifyStatus=jitem.getInteger("verifyStatus"); int verifyStatus = jitem.getInteger("verifyStatus");
if(verifyStatus==0){ //待审核 if (verifyStatus == 0) { //待审核
continue; continue;
} }
//查询是否存在商品 //查询是否存在商品
Goods dbgoods =goodsMapper.getGoodsByIsliCode(islicode); Goods dbgoods = goodsMapper.getGoodsByIsliCode(islicode);
String opmsg="";//操作信息 String opmsg = "";//操作信息
if(dbgoods!=null){ if (dbgoods != null) {
// 已经更新的，不再处理 // 已经更新的，不再处理
if(dbgoods.getApplyOut()==1 && dbgoods.getGoodsStatus()==2){ if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() == 2) {
continue; continue;
} }
OperationLog oplog = new OperationLog(); OperationLog oplog = new OperationLog();
oplog.setType("goods"); oplog.setType("goods");
oplog.setLogid(dbgoods.getId()); oplog.setLogid(dbgoods.getId());
String nowstr=sdf.format(new Date())+" "; String nowstr = sdf.format(new Date()) + " ";
//审核通过,更新对应的状态 //审核通过,更新对应的状态
if(verifyStatus==1){ if (verifyStatus == 1) {
String gid=dbgoods.getId().toString(); String gid = dbgoods.getId().toString();
// 商品状态 // 商品状态
Integer gstatusArr[]={1,5}; Integer gstatusArr[] = {1, 5};
List<Integer> gslist = Arrays.asList(gstatusArr); List<Integer> gslist = Arrays.asList(gstatusArr);
//申请撤销委托 //申请撤销委托
if(dbgoods.getApplyOut()==1 && dbgoods.getGoodsStatus()!=2){ if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() != 2) {
int ret =goodsMapper.updateGoodsField("goods_status","2",gid); int ret = goodsMapper.updateGoodsFieldInId("goods_status", "2", gid);
log.info("申请撤销委托："+islicode); if (ret == 1) {
//todo order操作订单 log.info("申请撤销委托：" + islicode);
opmsg = nowstr+"申请撤销委托审核通过"; //todo order操作订单
oplog.setMessage(opmsg); opmsg = nowstr + "申请撤销委托审核通过";
operationLogMapper.addLog(oplog); oplog.setMessage(opmsg);
}else{ operationLogMapper.addLog(oplog);
if(gslist.contains(dbgoods.getGoodsStatus()) && dbgoods.getGoodsStatus()!=2){ } else {
log.info("委托系统："+islicode); log.info("委托系统：" + islicode);
goodsMapper.updateGoodsField("goods_status","2",gid); goodsMapper.updateGoodsFieldInId("goods_status", "2", gid);
goodsMapper.updateGoodsField("apply_out","1",gid); goodsMapper.updateGoodsFieldInId("apply_out", "1", gid);
opmsg = nowstr+"委托系统撤销委托"; opmsg = nowstr + "委托系统撤销委托";
oplog.setMessage(opmsg); oplog.setMessage(opmsg);
operationLogMapper.addLog(oplog); operationLogMapper.addLog(oplog);
} }
} else {
//申请撤销委托审核不通过
if (dbgoods.getApplyOut() == 1) {
goodsMapper.updateGoodsField("apply_out", "0", islicode);
}
log.info("申请撤销委托审核不通过：" + islicode);
opmsg = nowstr + "申请撤销委托审核不通过";
oplog.setMessage(opmsg);
operationLogMapper.addLog(oplog);
} }
}else{
//申请撤销委托审核不通过
if(dbgoods.getApplyOut()==1){
goodsMapper.updateGoodsField("apply_out","0",islicode);
}
log.info("申请撤销委托审核不通过："+islicode);
opmsg = nowstr+"申请撤销委托审核不通过";
oplog.setMessage(opmsg);
operationLogMapper.addLog(oplog);
} }
} }
} }
} }
} }
} }
Write Preview
Loading…
Cancel
Save