|
|
@@ -56,31 +56,53 @@ public class CmOrderArchiveService extends CrudService<CmOrderArchiveDao, CmOrde
|
|
|
return super.findPage(page, cmOrderArchive);
|
|
|
}
|
|
|
|
|
|
- private static String endpoint = Global.getConfig("aliyun.endpoint");
|
|
|
- private static String accessKeyId = Global.getConfig("aliyun.accessKeyId");
|
|
|
- private static String accessKeySecret = Global.getConfig("aliyun.accessKeySecret");
|
|
|
- private static String privateBucket = Global.getConfig("aliyun.bucketName");
|
|
|
- private static String config = Global.getConfig("cm.config");
|
|
|
-
|
|
|
+
|
|
|
@Transactional(readOnly = false)
|
|
|
- public void save(CmOrderArchive cmOrderArchive) {
|
|
|
- if (cmOrderArchive.getIsNewRecord()) {
|
|
|
- SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
|
|
|
- StringBuilder orderArchiveNo = new StringBuilder(format.format(new Date()));
|
|
|
+ public Map<String,Object> saveArchive(CmOrderArchive cmOrderArchive) {
|
|
|
+ HashMap<String, Object> result = new HashMap<>(2);
|
|
|
+ if (cmOrderArchive.getIsNewRecord()) {
|
|
|
+ SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
|
|
|
+ StringBuilder orderArchiveNo = new StringBuilder(format.format(new Date()));
|
|
|
Random random = new Random();
|
|
|
for (int i = 0; i < 8; i++) {
|
|
|
orderArchiveNo.append(random.nextInt(10));
|
|
|
}
|
|
|
cmOrderArchive.setArchiveNo(orderArchiveNo.toString());
|
|
|
cmOrderArchive.setAddTime(new Date());
|
|
|
+ } else {
|
|
|
+ // 当新的子订单id和数据库中的子订单id不同时，校验新的子订单id是否可用
|
|
|
+ CmOrderArchive dbArchive = cmOrderArchiveDao.get(cmOrderArchive.getId());
|
|
|
+ if (!cmOrderArchive.getShopOrderId().equals(dbArchive.getShopOrderId())) {
|
|
|
+ // 检查子订单id是否存在
|
|
|
+ Integer existId = cmOrderArchiveDao.checkShopOrderIdExist(cmOrderArchive.getShopOrderId());
|
|
|
+ if (null == existId) {
|
|
|
+ result.put("code", -1);
|
|
|
+ result.put("msg", "子订单id不存在");
|
|
|
+ return result;
|
|
|
+ } else {
|
|
|
+ // 检查子订单是否已被使用
|
|
|
+ Integer ableId = cmOrderArchiveDao.checkShopOrderIdAble(cmOrderArchive.getShopOrderId());
|
|
|
+ if (null == ableId) {
|
|
|
+ result.put("code", -2);
|
|
|
+ result.put("msg", "该子订单id已使用");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
super.save(cmOrderArchive);
|
|
|
String fileIds = cmOrderArchive.getFileIds();
|
|
|
- for (String id : fileIds.split(",")) {
|
|
|
- if (StringUtil.isNotBlank(id)) {
|
|
|
- cmOrderArchiveDao.updateArchiveFile(Integer.valueOf(id),Integer.valueOf(cmOrderArchive.getId()));
|
|
|
+ if (StringUtil.isNotEmpty(fileIds)) {
|
|
|
+ for (String id : fileIds.split(",")) {
|
|
|
+ if (StringUtil.isNotBlank(id)) {
|
|
|
+ cmOrderArchiveDao.updateArchiveFile(Integer.valueOf(id),Integer.valueOf(cmOrderArchive.getId()));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ result.put("code", 0);
|
|
|
+ result.put("msg", "保存成功");
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
@Transactional(readOnly = false)
|
|
|
@@ -88,10 +110,6 @@ public class CmOrderArchiveService extends CrudService<CmOrderArchiveDao, CmOrde
|
|
|
super.delete(cmOrderArchive);
|
|
|
}
|
|
|
|
|
|
- public List<String> getShopOrderIdList(Integer shopOrderId) {
|
|
|
- return cmOrderArchiveDao.getShopOrderIdList(shopOrderId);
|
|
|
- }
|
|
|
-
|
|
|
public List<CmOrderArchiveFile> getArchiveFileList(String archiveId) {
|
|
|
return cmOrderArchiveDao.getArchiveFileList(Integer.parseInt(archiveId));
|
|
|
}
|
Aslee