修改

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -66,6 +66,7 @@ public class ElectronicMembershipCardController {
     //用户充值电子会员卡（储蓄卡）生成充值记录
     @RequestMapping(value = "/rechargeBalance", method = RequestMethod.POST)
     @ResponseBody
+    @Transactional
     public String rechargeBalance(@RequestBody RechargeBalance rechargeBalance){
         Gson gson =new Gson();
         //返回结果集
@@ -553,14 +554,14 @@ public class ElectronicMembershipCardController {
     //查询油站电子会员卡（储蓄卡）充值设置规则
     @RequestMapping(value = "/getCardRechargeSettingList", method = RequestMethod.GET)
     @ResponseBody
-    public String getCardRechargeSettingList(@RequestParam Integer stationId, String cardOilsType){
+    public String getCardRechargeSettingList(@RequestParam Integer stationId){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(stationId !=null && StringUtils.isNotBlank(cardOilsType)){
+        if(stationId !=null){
             CustomerCardSetting customerCardSetting = new CustomerCardSetting();
             customerCardSetting.setStationId(stationId);
-            customerCardSetting.setCardOilsType(cardOilsType);
+            //customerCardSetting.setCardOilsType(cardOilsType);
             customerCardSetting.setOrderBy("ASC");  //优惠规则升序排序
             List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
             resultData = ResultData.success(cardRechargeSettingList);

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -73,6 +73,7 @@ public class PosMachineController {
                         s.setPhonenumber(sysUser.getPhonenumber());
                         s.setSex(sysUser.getSex());
                         s.setUserId(sysUser.getUserId());
+                        s.setDeptId(sysUser.getDeptId());
                         resultData = ResultData.success(s);
                     }else{
                         resultData = ResultData.error(CodeMsg.PASSWORD_ERROR);
@@ -87,6 +88,29 @@ public class PosMachineController {
         return gson.toJson(resultData);
     }
 
+
+    /*
+     * 查询订单列表
+     * @param stationId
+     * @param userName
+     * @return
+     */
+    @RequestMapping (value = "/selectPosPayOrdersList", method = RequestMethod.GET)
+    @ResponseBody
+    public String selectPosPayOrdersList(@RequestParam Integer stationId, String beginTime, String endTime){
+        Gson gson =new Gson();
+        //返回结果集
+        ResultData resultData = null;
+        PayOrder payOrder = new PayOrder();
+        payOrder.setStationId(stationId);
+        payOrder.setBeginTime(beginTime);
+        payOrder.setEndTime(endTime);
+        payOrder.setStatus("1");
+        List<PayOrder> payOrders = payOrderService.selectPayOrderList(payOrder);
+        resultData = ResultData.success(payOrders);
+        return  gson.toJson(resultData);
+    }
+
     /*
      * 获取班结人要班结的订单总和信息
      * @param stationId