订单

src/main/java/com/minpay/shouhuo/ShOrderManageAction.java

@@ -89,8 +89,8 @@ public class ShOrderManageAction implements IMINAction {
 		List<Map<String, String>> ls = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ShOrderMapper.class).queryOrder(p,rows);
 		// 格式化
 		ls = Service.lookup(IFormatService.class).formatDateTime(ls, "createTime");
-		ls = new MINCopyFormat("{isDraw:'isDrawdesc',payMode:'payModedesc'}").format(ls);
-		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_TYPE'}");
+		ls = new MINCopyFormat("{isDraw:'isDrawdesc',payMode:'payModedesc','state':'statedesc','pickupStt':'pickupSttdesc'}").format(ls);
+		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_TYPE',statedesc:'ORDER_STATE',pickupSttdesc:'ORDER_PICKUP_STT'}");
 		// 设置返回值
 		res.set(IMINBusinessConstant.F_PAGING_LAY, ls);
 		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());

src/main/resources/com/minpay/db/table/own/mapper/ShOrderMapper.xml

@@ -28,6 +28,8 @@
 		VOI_PRODUCT_NAME	"productName",
 		VOI_PRODUCT_ID		"productId",
 		VOI_EQUREL_ID		"equrelId",
+		VOI_PICKUP_NO		"pickupNo",
+		VOI_PICKUP_STT		"pickupStt",
 		b.VCI_NAME  		"personName",
 		c.VEQ_NAME    		"equipmentName",
 		d.PRT_MASTER_MAP	"productImg"