diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java
index 7ae3ace2b..141253078 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java
@@ -134,6 +134,17 @@ public class WxPressBatchController extends BaseController {
wxPressBatchService.deleteItemById(record.getId(), getTenantInfo().getTenantId());
return new ResultData();
}
+
+ @ApiOperation("详情接口")
+ @PostMapping("updateStatus")
+ public ResultData updateStatus(@RequestBody WxPressBatch record) {
+ if (null == record.getId() || null == record.getStatus()) {
+ return new ResultData(Result.ERROR,"参数错误");
+ }
+ record.updateTenantInfo(getTenantInfo());
+ wxPressBatchService.updateStatus(record);
+ return new ResultData();
+ }
diff --git a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
index c44102679..970a2629c 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
@@ -47,6 +47,8 @@ public interface WxPressBatchService {
void deleteItemById(Long itemId,String tenantId);
void deleteItemByBatchId(Long batchId,String tenantId);
+ void updateStatus(WxPressBatch pressBatch);
+
//验证砍价人规则
ResultData checkBargainerPressBatchRule(WxOrder order, Long cUserId);
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
index 267eb4072..bd7cfa1bb 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
@@ -4,6 +4,7 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
@@ -69,6 +70,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
@Override
public void saveOrUpdate(WxPressBatch record) {
if (null == record.getId()) {
+ final IdWorker idWorker = IdWorker.get();
+ record.setId(idWorker.nextId());
record.setCreateDate(new Date());
record.setUpdateDate(new Date());
wxPressBatchMapper.insert(record);
@@ -106,8 +109,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
}
}
- @Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
+ @Override
public void deleteBatch(Long id, String tenantId) {
wxPressBatchMapper.deleteById(id, tenantId);
deleteItemByBatchId(id, tenantId);
@@ -128,6 +131,17 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
iteq.setPressBatchId(batchId);
wxPressBatchItemMapper.deleteAllItem(iteq);
}
+
+ @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
+ @Override
+ public void updateStatus(WxPressBatch pressBatch) {
+ wxPressBatchMapper.updateWxPressBatchStatus(pressBatch);
+ WxPressBatchItem item = new WxPressBatchItem();
+ item.updateTenantInfo(pressBatch);
+ item.setPressBatchId(pressBatch.getId());
+ item.setPressBatchStatus(pressBatch.getStatus());
+ wxPressBatchItemMapper.updateWxPressBatchStatus(item);
+ }
@Override
public ResultData checkBargainerPressBatchRule(WxOrder order, Long cUserId) {
@@ -202,5 +216,4 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
}
return null;
}
-
}
diff --git a/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml b/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml
index 29ff0ef35..b3121f7d1 100644
--- a/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml
@@ -79,7 +79,7 @@
- update wx_press_batch_item set press_batch_status = #{status} where `press_batch_id` = #{pressBatchId} and tenant_id=#{tenantId}
+ update wx_press_batch_item set press_batch_status = #{pressBatchStatus} where `press_batch_id` = #{pressBatchId} and tenant_id=#{tenantId}