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

修正订单详情不能查看

master
xyiege 3 years ago
parent
4864129505
commit
1fb26f7042
4 changed files with 44 additions and 42 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. 2
      src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java
  2. 2
      src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
  3. 78
      src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
  4. 4
      src/main/resources/mapper/szwh/OrderMapper.xml

2
src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java
View File

@ -62,11 +62,13 @@ public class OrderGoodsDetail implements Serializable {
private BigDecimal money;//商品总金额 private BigDecimal money;//商品总金额
@JSONField(name = "entrust_service_charge") @JSONField(name = "entrust_service_charge")
private BigDecimal entrustServiceCharge;//委托方服务费 private BigDecimal entrustServiceCharge;//委托方服务费
@JSONField(name = "entrust_money")
private BigDecimal entrustMoney;//委托方金额 private BigDecimal entrustMoney;//委托方金额
@JSONField(name = "goods_ownership") @JSONField(name = "goods_ownership")
private Integer goodsOwnership;//商品类型；1：所有权；2：使用权 private Integer goodsOwnership;//商品类型；1：所有权；2：使用权
@JSONField(name = "goods_ownership_str") @JSONField(name = "goods_ownership_str")
private String goodsOwnershipStr;//商品权属 private String goodsOwnershipStr;//商品权属
@JSONField(name = "goods_type")
private Integer goodsType;//商品类型；1：文化资源数据；2：文化数字内容 private Integer goodsType;//商品类型；1：文化资源数据；2：文化数字内容
@JSONField(name = "charges_type") @JSONField(name = "charges_type")
private Integer chargesType;//商品费用类型；1：免费；2：付费 private Integer chargesType;//商品费用类型；1：免费；2：付费

2
src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
View File

@ -127,7 +127,7 @@ public class OrderController extends BaseController {
outjson.put("msg","成功"); outjson.put("msg","成功");
// 两层data 包裹 // 两层data 包裹
outjson.put("data",retmap); outjson.put("data",retmap);
outjson.put("useTime",howuse+"s"); // outjson.put("useTime",howuse+"s");
return outjson; return outjson;
} }

78
src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
View File

@ -775,13 +775,13 @@ public class OrderServiceImpl implements OrderService {
public Map<String,Object> queryOrder(Map qmap, Integer userrole, Integer page, Integer limit) { public Map<String,Object> queryOrder(Map qmap, Integer userrole, Integer page, Integer limit) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
int start = page > 1 ? (page - 1) * limit : 0; int start = page > 1 ? (page - 1) * limit : 0;
Map outmap = new HashMap(); Map outmap = new LinkedHashMap();
//订单结算 todo //订单结算 todo
List<Order> orderList = orderMapper.getOrderList(qmap, start, limit); List<Order> orderList = orderMapper.getOrderList(qmap, start, limit);
//最后的结果返回list //最后的结果返回list
List outlist =new ArrayList(); List outlist =new ArrayList();
for (Order od : orderList) { for (Order od : orderList) {
Map<String, Object> retmap = new HashMap<>(); Map<String, Object> retmap = new LinkedHashMap<>();
//订单的产品转为map //订单的产品转为map
//JSONObject odjson = (JSONObject) JSON.toJSON(od); //JSONObject odjson = (JSONObject) JSON.toJSON(od);
//retmap = JSONObject.parseObject(odjson.toJSONString()); //retmap = JSONObject.parseObject(odjson.toJSONString());
@ -845,7 +845,7 @@ public class OrderServiceImpl implements OrderService {
//Map odgmap =new HashMap(); //Map odgmap =new HashMap();
// 利用goods detail的信息来初始化 // 利用goods detail的信息来初始化
//Map odgmap = JSONObject.parseObject(JSON.toJSONString(ogd)); //Map odgmap = JSONObject.parseObject(JSON.toJSONString(ogd));
Map odgmap = new HashMap(); Map odgmap = new LinkedHashMap();
odgmap.put("entrust_islicode",ogd.getEntrustIslicode()); odgmap.put("entrust_islicode",ogd.getEntrustIslicode());
odgmap.put("islicode",ogd.getIslicode()); odgmap.put("islicode",ogd.getIslicode());
odgmap.put("goods_name",ogd.getGoodsName()); odgmap.put("goods_name",ogd.getGoodsName());
@ -856,7 +856,7 @@ public class OrderServiceImpl implements OrderService {
odgmap.put("history_entrust_code",ogd.getHistoryEntrustCode()); odgmap.put("history_entrust_code",ogd.getHistoryEntrustCode());
odgmap.put("identifier",ogd.getIdentifier()); odgmap.put("identifier",ogd.getIdentifier());
odgmap.put("identifiers",ogd.getIdentifiers()); odgmap.put("identifiers",ogd.getIdentifiers());
odgmap.put("sourcedata_islicode",ogd.getSourceDownload()); odgmap.put("sourcedata_islicode",ogd.getSourcedataIslicode());
odgmap.put("close_serial_number",ogd.getCloseSerialNumber()); odgmap.put("close_serial_number",ogd.getCloseSerialNumber());
odgmap.put("price",ogd.getPrice()); odgmap.put("price",ogd.getPrice());
odgmap.put("goods_price",ogd.getGoodsPrice()); odgmap.put("goods_price",ogd.getGoodsPrice());
@ -866,38 +866,38 @@ public class OrderServiceImpl implements OrderService {
odgmap.put("money",ogd.getMoney()); odgmap.put("money",ogd.getMoney());
odgmap.put("entrust_service_charge",ogd.getEntrustServiceCharge()); odgmap.put("entrust_service_charge",ogd.getEntrustServiceCharge());
odgmap.put("entrust_money",ogd.getEarnestMoney()); odgmap.put("entrust_money",ogd.getEarnestMoney());
// "goods_ownership": 0, //
// "goods_ownership_str": "发行权", odgmap.put("goods_ownership",ogd.getGoodsOwnership());
// "goods_type": 1, odgmap.put("goods_ownership_str",ogd.getGoodsOwnershipStr());
// "charges_type": 2, odgmap.put("goods_type",ogd.getGoodsType());
// "goods_islicode": "010007-00000000384699999999-2", odgmap.put("charges_type",ogd.getChargesType());
// "goods_entrust": 2, odgmap.put("goods_islicode",ogd.getGoodsIslicode());
// "contractual_period": 2, odgmap.put("goods_entrust",ogd.getGoodsEntrust());
// "transaction_class": 1, odgmap.put("contractual_period",ogd.getContractualPeriod());
// "contract": "[]", odgmap.put("transaction_class",ogd.getTransactionClass());
// "otherIdentifiers": "11.30,第二次,一次性", odgmap.put("contract",ogd.getContract());
// "classification": " ", odgmap.put("otherIdentifiers",ogd.getOtherIdentifiers());
// "source_islicode": "", odgmap.put("classification",ogd.getClassification());
// "source_islicode_name": "", odgmap.put("source_islicode",ogd.getSourceIslicode());
// "source_download": null, odgmap.put("source_islicode_name",ogd.getSourceIslicodeName());
// "close_id": null, odgmap.put("source_download",ogd.getSourceDownload());
// "close_status": 1, odgmap.put("close_id",ogd.getCloseId());
// "is_close": 0, odgmap.put("close_status",ogd.getCloseStatus());
// "callback_msg": "", odgmap.put("is_close",ogd.getIsClose());
// "goods_status": 1, odgmap.put("callback_msg",ogd.getCallbackMsg());
// "entrust_month": 2,
//补充其他元素 //补充其他元素
//retmap.put("close_status", ogd.getCloseStatus()); //retmap.put("close_status", ogd.getCloseStatus());
// 查询委托方信息 // 查询委托方信息
// OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode()); OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode());
// if(entrUser!=null){ //not null if(entrUser!=null){ //not null
// odgmap.put("entrust_name",entrUser.getName()); odgmap.put("entrust_name",entrUser.getName());
// odgmap.put("attesttime",entrUser.getAttesttime()); odgmap.put("attesttime",entrUser.getAttesttime());
// odgmap.put("registertime",entrUser.getRegistertime()); odgmap.put("registertime",entrUser.getRegistertime());
// odgmap.put("userType",entrUser.getUserType()); odgmap.put("userType",entrUser.getUserType());
// odgmap.put("authType",entrUser.getAuthType()); odgmap.put("authType",entrUser.getAuthType());
// odgmap.put("state",entrUser.getState()); odgmap.put("state",entrUser.getState());
// } }
//查询商品状态 //查询商品状态
Goods tgoods = goodsMapper.getGoodsByIsli(ogd.getGoodsIslicode()); Goods tgoods = goodsMapper.getGoodsByIsli(ogd.getGoodsIslicode());
int igoodsStatus=4; //默认 int igoodsStatus=4; //默认
@ -938,7 +938,7 @@ public class OrderServiceImpl implements OrderService {
ogsJsonList.add(osgsMap); ogsJsonList.add(osgsMap);
} }
// convert to json // convert to json
odgmap.put("source", ogsJsonList); odgmap.put("source", ogsJsonList==null?"[]":ogsJsonList);
// //
odgList.add(odgmap); odgList.add(odgmap);
} }
@ -953,21 +953,21 @@ public class OrderServiceImpl implements OrderService {
if (userrole == 1 && od.getStatus() == 3) { if (userrole == 1 && od.getStatus() == 3) {
retmap.put("status", 4); retmap.put("status", 4);
} }
retmap.put("search_close_money", new BigDecimal(0)); //retmap.put("search_close_money", new BigDecimal(0));
retmap.put("total_close_money", new BigDecimal(0)); //retmap.put("total_close_money", new BigDecimal(0));
// //
outlist.add(retmap); outlist.add(retmap);
} }
//统计符合条件的总数 //统计符合条件的总数
int total = orderMapper.countOrderByMap(qmap); int total = orderMapper.countOrderByMap(qmap);
// 最外层 // 最外层
outmap.put("total_close_money",new BigDecimal("0.00")); outmap.put("total",total);
outmap.put("per_page",limit); outmap.put("per_page",limit);
outmap.put("current_page",page); outmap.put("current_page",page);
outmap.put("last_page",1); outmap.put("last_page",1);
outmap.put("total",total);
outmap.put("data",outlist); outmap.put("data",outlist);
outmap.put("total_close_money",new BigDecimal("0.00"));
outmap.put("search_close_money", new BigDecimal("0.00"));
return outmap; return outmap;
} }

4
src/main/resources/mapper/szwh/OrderMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="cn.chjyj.szwh.mapper.OrderMapper"> <mapper namespace="cn.chjyj.szwh.mapper.OrderMapper">
<sql id="column"> <sql id="column">
cast(id as char) as id,user_id as userId,buy_islicode as buyIslicode,batchcode,account_ratio_id as accountRatioId, id,user_id as userId,buy_islicode as buyIslicode,batchcode,account_ratio_id as accountRatioId,
history_buy_name as historyBuyName, history_buy_name as historyBuyName,
history_buy_code as historyBuyCode,total_service_charge as totalServiceCharge,total_money as totalMoney, history_buy_code as historyBuyCode,total_service_charge as totalServiceCharge,total_money as totalMoney,
`type`,`status`,transaction_islicode as transactionIslicode,ticketid,ticketmoney,ticketurl,ticketimage, `type`,`status`,transaction_islicode as transactionIslicode,ticketid,ticketmoney,ticketurl,ticketimage,
@ -100,7 +100,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
order by 'id' DESC ORDER BY id DESC
limit #{startRs},#{pageSize} limit #{startRs},#{pageSize}
</select> </select>

Write Preview
Loading…
Cancel
Save