Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
b9cf4fd78b
4 changed files with 66 additions and 34 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +13
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java
  4. +49
    -30
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java View File

@@ -320,7 +320,7 @@ public class WxFinanceController extends BaseController {
}
@GetMapping("finishStatus")
public ResultData receiveSetoffStatus() {
public ResultData finishStatus() {
List<Map> list = new ArrayList<Map>();
for (EnumFinanceFinishStatus t : EnumFinanceFinishStatus.values()) {
Map m = new HashMap();


+ 13
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java View File

@@ -83,7 +83,18 @@ public class WxFinancePrintController extends BaseController {
if (null == record.getTenantId()) {
return new ResultData(Result.ERROR,"参数不对");
}
wxFinancePrintService.saveOrUpdate(record);
wxFinancePrintService.save(record);
return new ResultData();
}
@ApiOperation("费用区间列表")
@PostMapping("updateTemplates")
@TenantIgnore
public ResultData updateTemplates(@RequestBody WxFinancePrintTemplate record) {
if (null == record.getTenantId()) {
return new ResultData(Result.ERROR,"参数不对");
}
wxFinancePrintService.update(record);
return new ResultData();
}
@@ -97,7 +108,7 @@ public class WxFinancePrintController extends BaseController {
WxFinancePrintTemplate template = wxFinancePrintService.getTemplateById(record.getId());
template.setId(null);
template.setName(template.getName()+"复制");
wxFinancePrintService.saveOrUpdate(template);
wxFinancePrintService.copy(template);
return new ResultData();
}


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java View File

@@ -12,7 +12,9 @@ public interface WxFinancePrintService {
List<WxFinancePrintData> printDataList(WxFinancePrintData record);
List<WxFinancePrintTemplate> printTemplateList(WxFinancePrintTemplate record);
WxFinancePrintTemplate getTemplateById(Long id);
void saveOrUpdate(WxFinancePrintTemplate record);
void save(WxFinancePrintTemplate record);
void update(WxFinancePrintTemplate record);
void copy(WxFinancePrintTemplate record);
void setTemplatesDel(WxFinancePrintTemplate record);
List<Map> parseTemplateData(String tenantId,Integer type,List<Long> dataIds);
}

+ 49
- 30
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java View File

@@ -57,45 +57,64 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
}

@Override
public void saveOrUpdate(WxFinancePrintTemplate record) {
public void save(WxFinancePrintTemplate record) {
Date date = new Date();
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setCreateTime(date);
record.setUpdateTime(date);
record.setName(record.getTitle());
Map map = new HashMap();
map.put("width", 770);
map.put("height", 500);
map.put("pageWidth", 215);
map.put("pageHeight", 140);
map.put("tempItems", record.getTempItems());
map.put("id", String.valueOf(record.getId()));
map.put("title", record.getName());
map.put("type", record.getType());
record.setContent(JSON.toJSONString(map));
try {
wxFinancePrintTemplateMapper.insert(record);
} catch (Exception e) {
logger.error("保存模板失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
}
@Override
public void update(WxFinancePrintTemplate record) {
WxFinancePrintTemplate t = getTemplateById(record.getId());
Map map = new HashMap();
if (StringUtils.isBlank(record.getContent())) {
map.put("width", 770);
map.put("height", 500);
map.put("pageWidth", 215);
map.put("pageHeight", 140);
map.put("id", String.valueOf(t.getId()));
map.put("title", record.getName());
map.put("type", t.getType());
map.put("tempItems", record.getTempItems());
record.setContent(JSON.toJSONString(map));
}
Date date = new Date();
if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setCreateTime(date);
record.setUpdateTime(date);
record.setName(record.getTitle());
JSONObject o = record.getContentJson();
o.put("id", String.valueOf(record.getId()));
o.put("title", record.getName());
o.put("type", record.getType());
o.put("tempItems", record.getTempItems());
record.setContent(JSON.toJSONString(o));
try {
wxFinancePrintTemplateMapper.insert(record);
} catch (Exception e) {
logger.error("保存模板失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
} else {
JSONObject o = record.getContentJson();
o.put("id", String.valueOf(record.getId()));
o.put("title", record.getName());
o.put("type", record.getType());
o.put("tempItems", record.getTempItems());
record.setContent(JSON.toJSONString(o));
record.setName(record.getTitle());
record.setUpdateTime(date);
wxFinancePrintTemplateMapper.updateById(record);
}
JSONObject o = record.getContentJson();
o.put("title", record.getName());
o.put("tempItems", record.getTempItems());
record.setContent(JSON.toJSONString(o));
record.setName(record.getTitle());
record.setUpdateTime(date);
wxFinancePrintTemplateMapper.updateById(record);
}
@Override
public void copy(WxFinancePrintTemplate record) {
WxFinancePrintTemplate t = getTemplateById(record.getId());
final IdWorker idWorker = IdWorker.get();
t.setId(idWorker.nextId());
t.setCreateTime(new Date());
t.setUpdateTime(new Date());
wxFinancePrintTemplateMapper.insert(record);
}

@Override


Loading…
Cancel
Save