fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -54,6 +54,7 @@ import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import org.yeshi.utils.DateUtil; import org.yeshi.utils.IPUtil; import org.yeshi.utils.JsonUtil; @@ -896,7 +897,6 @@ // 单笔收益金额 BigDecimal money = hongBao.getMoney(); BigDecimal payMoney = hongBao.getPayMoney(); map.put("getTime",getTime); @@ -909,13 +909,31 @@ /* 订单状态判断：1 订单已付款 2、订单已结算 4、订单失效 */ if (state == HongBao.STATE_SHIXIAO) { map.put("orderState",4); // 订单失效 } else if (state == HongBao.STATE_BUKELINGQU || state == HongBao.STATE_KELINGQU) { if (preGettime != null && preGettime > 0) { map.put("orderState",2); // 订单结算 } else if (state == HongBao.STATE_BUKELINGQU) { Integer orderState = null; if (type == HongBao.TYPE_SHARE_GOODS) { // 分享订单 Long hongbaoId = hongBao.getId(); PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId); String pidstate = pidOrder.getState(); if ("订单付款".equals(pidstate)) { orderState = 1; } else if ("订单结算".equals(pidstate)) { orderState = 2; } else if ("订单失效".equals(pidstate)) { orderState = 4; } } else { map.put("orderState",1); // 订单已付款 if (preGettime != null && preGettime > 0) { orderState = 2; // 订单结算 } else { orderState = 1; // 订单已付款 } } } else { map.put("orderState",orderState); } else if (state == HongBao.STATE_KELINGQU || state == HongBao.STATE_YILINGQU) { map.put("orderState",2); // 订单结算 }
@@ -386,7 +386,8 @@ try { systemClientParamsService.addSystemClientParams(systemClientParams, null); systemClientParamsService.saveAdd(systemClientParams, list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功")); } catch (Exception e) { @@ -417,8 +418,8 @@ try { List<SystemClientParams> list = systemClientParamsService.getSystemClientParamsBySystemId(systemClientParams.getId()); if (list == null) { systemClientParamsService.getById(systemClientParams.getId()); if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在")); return; } fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
@@ -313,12 +313,12 @@ if (StringUtil.isNullOrEmpty(key)) { list = systemClientParamsDao.list("from SystemClientParams scp where scp.system.id = ? ", new Serializable[] {systemId}); start, count, new Serializable[] {systemId}); } else { list = systemClientParamsDao.list( "from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)", new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"}); start, count, new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"}); } } @@ -332,21 +332,21 @@ if (systemId == null) { if (StringUtil.isNullOrEmpty(key)) { return systemClientParamsDao.getCount("from SystemClientParams scp"); return systemClientParamsDao.getCount(" select count(id) from SystemClientParams scp"); } else { return systemClientParamsDao.getCount("from SystemClientParams scp where (scp.name like ? or scp.key like ?) ", return systemClientParamsDao.getCount(" select count(id) from SystemClientParams scp where (scp.name like ? or scp.key like ?) ", new Serializable[] { "%" + key + "%" ,"%" + key + "%"}); } } else { if (StringUtil.isNullOrEmpty(key)) { return systemClientParamsDao.getCount("from SystemClientParams scp where scp.system.id = ? ", return systemClientParamsDao.getCount(" select count(id) from SystemClientParams scp where scp.system.id = ? ", new Serializable[] {systemId}); } else { return systemClientParamsDao.getCount( "from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)", " select count(id) from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)", new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"}); } } @@ -355,6 +355,7 @@ @Transactional @Override public void saveAdd(SystemClientParams scp, List<Long> listId) throws Exception { if (listId == null || listId.size() == 0) { fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java
@@ -90,4 +90,6 @@ */ public void deleteBatchByPrimaryKey(List<Long> ids); public void saveAdd(SystemClientParams scp, List<Long> listId) throws Exception; }
