src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java

@@ -4,12 +4,12 @@ import com.min.util.CommonUtil;
 import com.minpay.common.bean.User;
 import com.minpay.common.constant.Constant;
 import com.minpay.common.format.IFormatService;
+import com.minpay.common.service.ILogService;
 import com.minpay.common.util.DateUtil;
 import com.minpay.db.table.mapper.VmEquipmentInfMapper;
+import com.minpay.db.table.mapper.VmPersonRoleInfMapper;
 import com.minpay.db.table.mapper.VmProEquRelMapper;
-import com.minpay.db.table.model.VmEquipmentInf;
-import com.minpay.db.table.model.VmProEquRel;
-import com.minpay.db.table.model.VmProEquRelExample;
+import com.minpay.db.table.model.*;
 import com.minpay.db.table.own.mapper.MachineManageMapper;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.res.MINActionResult;
@@ -60,6 +60,11 @@ public class MachineManageAction implements IMINAction {
     /**主页数据*/
     public final static String	HOME_PAGE_DATA			= "homePageData";
 
+    /**
+     * 编辑售货机二维码状态
+     */
+    public final static String EDIT_MACHINE_CODE_STATE = "editMachineCodeState";
+
     private boolean contains;
 
 
@@ -367,4 +372,44 @@ public class MachineManageAction implements IMINAction {
         res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
         return res;
     }
+
+    /**
+     * 调整售货机二维码状态
+     * @param equId 机器编号
+     * @param applyState 二维码状态
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = EDIT_MACHINE_CODE_STATE)
+    public MINActionResult editMachineCodeState(
+            @MINParam(key = "equId") String equId,
+            @MINParam(key = "applyState") String applyState,
+            MINSession session
+    ) throws MINBusinessException {
+        MINActionResult res = new MINActionResult();
+        //查询当前用户是否是本机器的管理员
+        User user = session.getUser();
+        String personId = user.getId();
+        String branchid = user.getBranchId();
+        /**校验用户是否是商户的内管员*/
+        VmPersonRoleInfExample vmPersonRoleInfExample = new VmPersonRoleInfExample();
+        vmPersonRoleInfExample.createCriteria().andBranchIdEqualTo(branchid)
+                .andStateEqualTo("00").andPersonIdEqualTo(personId).andRoleEqualTo("02");
+        List<VmPersonRoleInf> vmPersonRoleInfList = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmPersonRoleInfMapper.class).selectByExample(vmPersonRoleInfExample);
+        if(vmPersonRoleInfList.size() != 1){
+            throw new MINBusinessException("权限不足!");
+        }
+        /**进行编辑*/
+        VmEquipmentInf vmEquipmentInf = new VmEquipmentInf();
+        vmEquipmentInf.setId(equId);
+        vmEquipmentInf.setApplystate(applyState);
+        Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmEquipmentInfMapper.class)
+                .updateByPrimaryKeySelective(vmEquipmentInf);
+
+        /**记录日志*/
+        String logInfo = "H5操作员:" + user.getName() + "编辑设备二维码状态，编号:" + equId+"调整状态为:"+applyState;
+        Service.lookup(ILogService.class).logging(session, logInfo);
+        return res;
+    }
 }

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

@@ -44,6 +44,9 @@ public class ShOrderManageAction implements IMINAction {
 	/**会员下单*/
 	public static final String ADD_ORDER_INFO = "addOrderInfo";
 
+	/**查询订单（订单详情）*/
+	public final static String	QUERY_ORDERNEW				= "queryOrderNew";
+
 	/**
 	 *查询订单
 	 * @param session
@@ -239,6 +242,88 @@ public class ShOrderManageAction implements IMINAction {
 
 
 
+	/**
+	 *新查询订单（管理）
+	 * @param session
+	 * @param page
+	 * @param limit
+	 * @param equipmentId	机器编号		1
+	 * @param equipmentName
+	 * @param freightwayId	货道编号		1
+	 * @param payMode		支付方式		1
+	 * @param dates			日期（区间）	1
+	 * @param playerId
+	 * @param playerName	玩家名称		1
+	 * @param state			支付状态		1
+	 * @param orderNo		订单号		1
+	 * @param isDraw		是否中奖
+	 * @param productName	商品名称		1
+	 * @param gameRule		购买方式		1
+	 * @param deliveryId	出货编号    1
+	 * @param fapRequest
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = QUERY_ORDERNEW)
+	public MINActionResult queryOrderNew(
+			MINSession session,
+			@MINParam(key = "page", defaultValue = "1") int page,
+			@MINParam(key = "limit", defaultValue = "3") int limit,
+			@MINParam(key = "equipmentId") String equipmentId,
+			@MINParam(key = "equipmentName") String equipmentName,
+			@MINParam(key = "freightwayId") String freightwayId,
+			@MINParam(key = "payMode") String payMode,
+			@MINParam(key = "dates") String dates,
+			@MINParam(key = "playerId") String playerId,
+			@MINParam(key = "playerName") String playerName,
+			@MINParam(key = "state") String state,
+			@MINParam(key = "orderNo") String orderNo,
+			@MINParam(key = "isDraw") String isDraw,
+			@MINParam(key = "productName") String productName,
+			@MINParam(key = "gameRule") String gameRule,
+			@MINParam(key = "deliveryId") String deliveryId,
+			@MINParam(key = "pickupStt") String pickupStt,
+			@MINParam(key = "openId") String openId,
+			@MINParam(key = "imeiAddr") String imeiAddr,
+			MINHttpServletRequestContext fapRequest
+	) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		// 创建查询条件
+		Map<String, String> p = new HashMap<String, String>();
+		p.put("equipmentId",equipmentId);
+		p.put("equipmentName",equipmentName);
+		p.put("freightwayId",freightwayId);
+		p.put("payMode",payMode);
+		p.put("playerId",playerId);
+		p.put("state",state);
+		p.put("dates", dates);
+		p.put("orderNo", orderNo);
+		p.put("playerName", playerName);
+		p.put("isDraw", isDraw);
+		p.put("productName", productName);
+		p.put("gameRule", gameRule);
+		p.put("deliveryId", deliveryId);
+		p.put("pickupStt", pickupStt);
+		p.put("openId", openId);
+		p.put("imeiAddr", imeiAddr);
+		User user = session.getUser();
+		if(!user.getBranchId().equals(Constant.ADMINISTRATION_SYSTEM_NUMBER)){
+			p.put("branchId", user.getBranchId());
+		}
+
+		// 查询OrderInfMapper.xml
+		List<Map<String, String>> ls = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ShOrderMapper.class).queryOrderNew(p,rows);
+		// 格式化
+		ls = Service.lookup(IFormatService.class).formatDateTime(ls, "createTime");
+		ls = new MINCopyFormat("{isDraw:'isDrawdesc',payMode:'payModedesc','state':'statedesc','pickupStt':'pickupSttdesc','gameRule':'gameRuledesc'}").format(ls);
+		ls = Service.lookup(IFormatService.class).formatEnum(ls, "{isDrawdesc:'IS_DRAW',payModedesc:'PAY_MODE',statedesc:'ORDER_STATE',pickupSttdesc:'ORDER_PICKUP_STT',gameRuledesc:'GAME_RULE'}");
+
+		// 设置返回值
+		res.set(IMINBusinessConstant.F_PAGING_LAY, ls);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+		return res;
+	}
 
 
 }