POS机端接口

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

@@ -304,14 +304,14 @@ public class IntegralShoppingMallController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(unionId !=null){
+        if(StringUtils.isNotBlank(unionId) && stationId !=null){
             IntegralOrder integralOrder = new IntegralOrder();
             integralOrder.setUnionId(unionId);
             integralOrder.setStationId(stationId);
             List<IntegralOrder> integralOrderList = integralOrderService.getUserIntegralOrderList(integralOrder);
             resultData=ResultData.success(integralOrderList);
         }else {
-            resultData=ResultData.success(CodeMsg.REQUEST_FAIL);
+            resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }
@@ -323,7 +323,7 @@ public class IntegralShoppingMallController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(unionId !=null){
+        if(StringUtils.isNotBlank(unionId) && stationId !=null){
             CustomerPoints customerPoints  =new CustomerPoints();
             customerPoints.setUnionId(unionId);
             customerPoints.setStationId(stationId);
@@ -342,7 +342,7 @@ public class IntegralShoppingMallController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(unionId !=null){
+        if(StringUtils.isNotBlank(unionId) && stationId !=null){
             CustomerPointsRecord customerPointsRecord  =new CustomerPointsRecord();
             customerPointsRecord.setUnionId(unionId);
             customerPointsRecord.setStationId(stationId);
@@ -354,7 +354,7 @@ public class IntegralShoppingMallController {
             List<CustomerPointsRecord> customerPointsRecordList = customerPointsRecordService.getCustomerPointsRecordList(customerPointsRecord);
             resultData=ResultData.success(customerPointsRecordList);
         }else {
-            resultData=ResultData.success(CodeMsg.REQUEST_FAIL);
+            resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }
@@ -366,7 +366,7 @@ public class IntegralShoppingMallController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(stationId !=null){
+        if(stationId !=null && StringUtils.isNotBlank(oilName) && StringUtils.isNotBlank(oilType)){
             IntegralRule integralRule = new IntegralRule();
             integralRule.setStationId(stationId);
             integralRule.setOilName(oilName);
@@ -375,7 +375,7 @@ public class IntegralShoppingMallController {
             List<IntegralRule> integralRuleList = integralRuleService.getIntegralRule(integralRule);
             resultData=ResultData.success(integralRuleList);
         }else {
-            resultData=ResultData.success(CodeMsg.REQUEST_FAIL);
+            resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }
@@ -394,7 +394,7 @@ public class IntegralShoppingMallController {
             List<IntegralRule> integralRuleList = integralRuleService.getIntegralRule(integralRule);
             resultData=ResultData.success(integralRuleList);
         }else {
-            resultData=ResultData.success(CodeMsg.REQUEST_FAIL);
+            resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }

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

@@ -87,6 +87,48 @@ public class PosMachineController {
         return gson.toJson(resultData);
     }
 
+    //查询POS机昨天和近七天数据
+    @RequestMapping (value = "/selectPosYesterDayAndSevenData", method = RequestMethod.GET)
+    @ResponseBody
+    public String selectPosYesterDayAndSevenData(@RequestParam Integer stationId){
+        Gson gson =new Gson();
+        //返回结果集
+        ResultData resultData = null;
+        if(stationId !=null){
+            PayOrder payOrder = new PayOrder();
+            payOrder.setStatus("1");
+            payOrder.setStationId(stationId);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            payOrder.setEndTime(sdf.format(new Date()));
+            Calendar c = new GregorianCalendar();
+            c.setTime(new Date());
+            c.add(Calendar.DATE, -8);
+            payOrder.setBeginTime(sdf.format(c.getTime()));
+            //获取近七天数据
+            List<Map<String, Object>> mapList = payOrderService.selectPosRecentlySevenData(payOrder);
+            //获取昨日数据
+            Calendar cc = new GregorianCalendar();
+            payOrder.setEndTime(sdf.format(new Date()));
+            cc.add(Calendar.DATE, -1);
+            payOrder.setBeginTime(sdf.format(cc.getTime()));
+            cc.add(Calendar.DATE, -6);
+            payOrder.setEndTimeQOQ(sdf.format(cc.getTime()));
+            cc.add(Calendar.DATE, -1);
+            payOrder.setBeginTimeQOQ(sdf.format(cc.getTime()));
+            Map<String, Object> map = payOrderService.selectPosYesterDayData(payOrder);
+            //存放结果集
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("yesterDayData", map);
+            resultMap.put("recentlySevenData", mapList);
+            resultData = ResultData.success(resultMap);
+        }else {
+            resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
+        }
+        return gson.toJson(resultData);
+    }
+
+
+
 
     /*
      * 查询订单列表
@@ -112,7 +154,7 @@ public class PosMachineController {
     }
 
     /*
-     * 查询订单列表
+     * 查询班结后总数据
      * @param stationId
      * @param userName
      * @return

YijiaRestful/src/main/java/com/platform/yijia/dao/PayOrderMapper.java

@@ -11,6 +11,12 @@ import org.apache.ibatis.annotations.Param;
 
 public interface PayOrderMapper {
 
+    //查询POS机近七天数据
+    List<Map<String, Object>> selectPosRecentlySevenData(PayOrder payOrder);
+
+    //获取POS机昨天数据
+    Map<String, Object> selectPosYesterDayData(PayOrder payOrder);
+
     //查询汇总数据
     List<Map> selectSum(PayOrder payOrder);
 

YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -58,6 +58,9 @@ public class PayOrder {
     private String classStructureDate;
     private String classStructureMan;
 
+
+    private String beginTimeQOQ;    //环比开始时间
+    private String endTimeQOQ;      //环比结束时间
     private AppUserInfo appUserInfo;
 
 }

YijiaRestful/src/main/java/com/platform/yijia/service/PayOrderService.java

@@ -10,6 +10,12 @@ import java.util.Map;
 
 public interface PayOrderService {
 
+    //查询POS机近七天数据
+    List<Map<String, Object>> selectPosRecentlySevenData(PayOrder payOrder);
+
+    //获取POS机昨天数据
+    Map<String, Object> selectPosYesterDayData(PayOrder payOrder);
+
     //查询汇总数据
     List<Map> selectSum(PayOrder payOrder);
 

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -24,6 +24,18 @@ public class PayOrderServiceImpl implements PayOrderService {
     @Resource
     private PayOrderMapper payOrderMapper;
 
+    //获取POS机昨天数据
+    @Override
+    public Map<String, Object> selectPosYesterDayData(PayOrder payOrder) {
+        return payOrderMapper.selectPosYesterDayData(payOrder);
+    }
+
+    //查询POS机近七天数据
+    @Override
+    public List<Map<String, Object>> selectPosRecentlySevenData(PayOrder payOrder) {
+        return payOrderMapper.selectPosRecentlySevenData(payOrder);
+    }
+
     //查询订单信息
     @Override
     public List<PayOrder> getPayOrderList(String orderNo) {

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -214,6 +214,59 @@
             </if>
   </select>
 
+    <!--查询昨日数据-->
+    <select id="selectPosYesterDayData" parameterType="com.platform.yijia.pojo.PayOrder" resultType="map">
+        SELECT
+            DATE_FORMAT(NOW() -INTERVAL 8 DAY,"%w") AS week,
+            amtSum,
+            orderSum,
+            averPrice,
+            IFNULL(ROUND(((amtSum-amtSumTT2)/amtSumTT2),2), 0)	AS QOQ
+        FROM (
+            (SELECT
+                T1.station_id,
+                SUM(T1.amt)         AS amtSum,
+                COUNT(T1.order_no)	AS orderSum,
+                ROUND((SUM(T1.amt)/COUNT(T1.order_no)),2)	AS averPrice
+            FROM pay_order          AS T1
+            WHERE
+                T1.station_id = #{stationId}
+                AND T1.`status` = "1"
+                AND T1.created_date &gt;= #{beginTime}
+                AND T1.created_date &lt; #{endTime})    AS TT1 LEFT JOIN
+            (SELECT
+                T2.station_id,
+                SUM(T2.amt)         AS amtSumTT2
+            FROM pay_order          AS T2
+            WHERE
+                T2.station_id = #{stationId}
+                AND T2.`status` = "1"
+                AND T2.created_date &gt;= #{beginTimeQOQ}
+                AND T2.created_date &lt; #{endTimeQOQ})	AS TT2	ON TT1.station_id = TT2.station_id
+        )
+    </select>
+
+    <!--POS机查询近七天数据-->
+    <select id="selectPosRecentlySevenData" parameterType="com.platform.yijia.pojo.PayOrder" resultType="map">
+        SELECT
+            DATE_FORMAT(T3.days, '%m-%d')	AS time,
+            SUM(IFNULL(T2.amt,0))           AS amtSum,
+            COUNT(T2.order_no)              AS orderSum
+        FROM (
+            ( SELECT
+                @date := DATE_ADD(@date, INTERVAL + 1 DAY) AS days
+              FROM
+                ( SELECT @date := DATE_ADD(#{endTime}, INTERVAL - 8 DAY) FROM pay_order LIMIT 7 ) T1
+            ) T3 LEFT JOIN pay_order AS T2 ON T3.days = DATE_FORMAT(T2.created_date, '%Y-%m-%d')
+                AND T2.station_id= #{stationId}
+                AND T2.status= #{status}
+                AND T2.created_date &gt;= #{beginTime}
+                AND T2.created_date &lt; #{endTime}
+        )
+        GROUP BY T3.days
+    </select>
+
+
 
   <!--查询班结时间内订单-->
   <select id="selectPayOrderList" parameterType="com.platform.yijia.pojo.PayOrder" resultMap="BaseResultMap">