Przeglądaj źródła

feat: "线下+海外订单添加设备类型和公司平台"

Ritchie 2 lat temu
rodzic
commit
ac9c4fe25f

+ 40 - 36
src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -39,7 +39,7 @@ import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  * </p>
  *
  *
  * @author wuhs
  * @author wuhs
@@ -81,7 +81,8 @@ public class TCoinOrderController {
 //    }
 //    }
 
 
     /**
     /**
-     * 保存 线下+海外 订单
+     * 保存 线下/海外纸币器 订单
+     *
      * @param coinOrderVO
      * @param coinOrderVO
      * @return
      * @return
      */
      */
@@ -117,31 +118,34 @@ public class TCoinOrderController {
         coinOrder.setSn(sn);
         coinOrder.setSn(sn);
         coinOrder.setStatus("1"); // 线下纸币器订单都是已付款
         coinOrder.setStatus("1"); // 线下纸币器订单都是已付款
         coinOrder.setIsAir("0"); // 非空中云汇
         coinOrder.setIsAir("0"); // 非空中云汇
-        // 设备类型0或null是棉花糖,1是爆米花
-        if ("1".equals(machineType)) {
-            coinOrder.setMachineType("1");
-        }
-        // 如果是七云
-        if ("1".equals(companyType)) {
-            coinOrder.setCompanyType("1");
-        }
-        if(coinOrderVO.getProductNumber()==null||coinOrderVO.getProductNumber()==0){
+//        // 设备类型0或null是棉花糖,1是爆米花
+//        if ("1".equals(machineType)) {
+//            coinOrder.setMachineType("1");
+//        }
+//        // 如果是七云
+//        if ("1".equals(companyType)) {
+//            coinOrder.setCompanyType("1");
+//        }
+        coinOrder.setMachineType(machineType);
+        coinOrder.setCompanyType(companyType);
+
+        if (coinOrderVO.getProductNumber() == null || coinOrderVO.getProductNumber() == 0) {
             coinOrderVO.setProductNumber(1);
             coinOrderVO.setProductNumber(1);
-        }else {
+        } else {
             coinOrder.setProductNumber(coinOrderVO.getProductNumber());
             coinOrder.setProductNumber(coinOrderVO.getProductNumber());
         }
         }
-        if(StringUtils.isNotEmpty(coinOrderVO.getCreateDate())){
-            java.text.SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
+        if (StringUtils.isNotEmpty(coinOrderVO.getCreateDate())) {
+            java.text.SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date1 = null;
             Date date1 = null;
             try {
             try {
-                date1 =  formatter.parse(coinOrderVO.getCreateDate());
+                date1 = formatter.parse(coinOrderVO.getCreateDate());
             } catch (ParseException e) {
             } catch (ParseException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
             coinOrder.setCreateDate(date1);
             coinOrder.setCreateDate(date1);
             coinOrder.setModifyDate(date1);
             coinOrder.setModifyDate(date1);
             coinOrder.setPayDate(date1);
             coinOrder.setPayDate(date1);
-        }else{
+        } else {
             coinOrder.setCreateDate(new Date());
             coinOrder.setCreateDate(new Date());
             coinOrder.setModifyDate(new Date());
             coinOrder.setModifyDate(new Date());
             coinOrder.setPayDate(new Date());
             coinOrder.setPayDate(new Date());
@@ -149,7 +153,7 @@ public class TCoinOrderController {
         coinOrderService.save(coinOrder);
         coinOrderService.save(coinOrder);
         try {
         try {
             esTCoinOrderService.insertData(coinOrder);
             esTCoinOrderService.insertData(coinOrder);
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         return JsonMessage.success("添加线下订单成功");
         return JsonMessage.success("添加线下订单成功");
@@ -162,19 +166,19 @@ public class TCoinOrderController {
     public String list(String clientId, String sn, String productName, Integer payType, Date begin, Date end, Pageable pageable) {
     public String list(String clientId, String sn, String productName, Integer payType, Date begin, Date end, Pageable pageable) {
         LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
         LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
         if (StringUtils.isNotEmpty(sn)) {
         if (StringUtils.isNotEmpty(sn)) {
-            query.eq(TCoinOrder::getSn,sn);
+            query.eq(TCoinOrder::getSn, sn);
         }
         }
         if (StringUtils.isNotEmpty(productName)) {
         if (StringUtils.isNotEmpty(productName)) {
-            query.eq(TCoinOrder::getProductName,productName);
+            query.eq(TCoinOrder::getProductName, productName);
         }
         }
         if (payType != null) {
         if (payType != null) {
-            query.eq(TCoinOrder::getPayType,payType);
+            query.eq(TCoinOrder::getPayType, payType);
         }
         }
         if (begin != null && end != null) {
         if (begin != null && end != null) {
-            query.gt(TCoinOrder::getPayDate,begin);
-            query.lt(TCoinOrder::getPayDate,end);
+            query.gt(TCoinOrder::getPayDate, begin);
+            query.lt(TCoinOrder::getPayDate, end);
         }
         }
-        query.eq(TCoinOrder::getClientId,clientId);
+        query.eq(TCoinOrder::getClientId, clientId);
         int size = pageable.getPageSize();
         int size = pageable.getPageSize();
         int current = pageable.getPageNumber();
         int current = pageable.getPageNumber();
         Page<TCoinOrder> page = new Page<>(current, size, true);
         Page<TCoinOrder> page = new Page<>(current, size, true);
@@ -189,31 +193,31 @@ public class TCoinOrderController {
     //设备查询线下订单记录
     //设备查询线下订单记录
     @RequestMapping(value = "/newFindCoinOrder", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     @RequestMapping(value = "/newFindCoinOrder", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     @ResponseBody
     @ResponseBody
-    public String newFindCoinOrder(String clientId, String sn, String productName, Integer payType, String begin,String end, Pageable pageable) {
+    public String newFindCoinOrder(String clientId, String sn, String productName, Integer payType, String begin, String end, Pageable pageable) {
         LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
         LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
-        java.text.SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
+        java.text.SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date1 = null;
         Date date1 = null;
         Date date2 = null;
         Date date2 = null;
         try {
         try {
-            date1 =  formatter.parse(begin);
-            date2 =  formatter.parse(end);
+            date1 = formatter.parse(begin);
+            date2 = formatter.parse(end);
         } catch (ParseException e) {
         } catch (ParseException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         if (StringUtils.isNotEmpty(sn)) {
         if (StringUtils.isNotEmpty(sn)) {
-            query.eq(TCoinOrder::getSn,sn);
+            query.eq(TCoinOrder::getSn, sn);
         }
         }
         if (StringUtils.isNotEmpty(productName)) {
         if (StringUtils.isNotEmpty(productName)) {
-            query.eq(TCoinOrder::getProductName,productName);
+            query.eq(TCoinOrder::getProductName, productName);
         }
         }
         if (payType != null) {
         if (payType != null) {
-            query.eq(TCoinOrder::getPayType,payType);
+            query.eq(TCoinOrder::getPayType, payType);
         }
         }
         if (begin != null && end != null) {
         if (begin != null && end != null) {
-            query.gt(TCoinOrder::getPayDate,begin);
-            query.lt(TCoinOrder::getPayDate,end);
+            query.gt(TCoinOrder::getPayDate, begin);
+            query.lt(TCoinOrder::getPayDate, end);
         }
         }
-        query.eq(TCoinOrder::getClientId,clientId);
+        query.eq(TCoinOrder::getClientId, clientId);
         int size = pageable.getPageSize();
         int size = pageable.getPageSize();
         int current = pageable.getPageNumber();
         int current = pageable.getPageNumber();
         Page<TCoinOrder> page = new Page<>(current, size, true);
         Page<TCoinOrder> page = new Page<>(current, size, true);
@@ -229,12 +233,12 @@ public class TCoinOrderController {
     @RequestMapping(value = "/listCoin", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     @RequestMapping(value = "/listCoin", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     @ResponseBody
     @ResponseBody
     public Object findByTime(String clientId, String startTime, String endTime) {
     public Object findByTime(String clientId, String startTime, String endTime) {
-        java.text.SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
+        java.text.SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date1 = null;
         Date date1 = null;
         Date date2 = null;
         Date date2 = null;
         try {
         try {
-            date1 =  formatter.parse(startTime);
-            date2 =  formatter.parse(endTime);
+            date1 = formatter.parse(startTime);
+            date2 = formatter.parse(endTime);
         } catch (ParseException e) {
         } catch (ParseException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }

+ 82 - 12
src/main/java/com/szwl/controller/TOrderController.java

@@ -79,15 +79,18 @@ public class TOrderController {
     SzwlFeign szwlFeign;
     SzwlFeign szwlFeign;
     @Autowired
     @Autowired
     TOrderDetailsService orderDetailsService;
     TOrderDetailsService orderDetailsService;
+
+    // 获取订单列表
     @GetMapping("/pageOrder")
     @GetMapping("/pageOrder")
     public ResponseModel<IPage<?>> pageOrder(String equipmentId, String adminId, String adminType,
     public ResponseModel<IPage<?>> pageOrder(String equipmentId, String adminId, String adminType,
                                              String type, String sn, String status, String userName,
                                              String type, String sn, String status, String userName,
                                              String payType, String productNo, String clientId,
                                              String payType, String productNo, String clientId,
-                                             String trxNo, String dateType, String startDate, String companyType, String machineType, String endDate, long current, long size) {
+                                             String trxNo, String dateType, String startDate, String companyType, String machineType, String endDate, long current, long size, String isAir) {
         //判断当前账号状态
         //判断当前账号状态
         TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId));
         TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId));
         if (StringUtils.isEmpty(type)) {
         if (StringUtils.isEmpty(type)) {
             if (StringUtils.isNotEmpty(admin.getIfForeign())) {
             if (StringUtils.isNotEmpty(admin.getIfForeign())) {
+                // 0 国内,1 海外
                 type = admin.getIfForeign();
                 type = admin.getIfForeign();
             } else {
             } else {
                 if (!admin.getIsAdmined()) {
                 if (!admin.getIsAdmined()) {
@@ -99,7 +102,7 @@ public class TOrderController {
             }
             }
         }
         }
         //类型
         //类型
-        //0,线上
+        //0,线上 -》 国内
         if (type.equals("0")) {
         if (type.equals("0")) {
             LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
             LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
             if (!userName.equals("admin")) {
             if (!userName.equals("admin")) {
@@ -197,23 +200,43 @@ public class TOrderController {
                 query.eq(TOrder::getStatus, status);
                 query.eq(TOrder::getStatus, status);
             }
             }
             // 公司平台
             // 公司平台
+//            // 申泽平台管理员
+//            if (admin.getId() == 2738) {
+//                companyType = "0";
+//            }
+//            // 七云平台管理员
+//            if (admin.getId() == 2739) {
+//                companyType = "1";
+//            }
+//            if (StringUtils.isNotEmpty(companyType)) {
+//                if (companyType.equals("0")) {
+//                    String finalCompanyType = companyType;
+//                    query.nested(q -> q.isNull(TOrder::getCompanyType).or()
+//                            .eq(TOrder::getCompanyType, finalCompanyType));
+//                } else {
+//                    query.eq(TOrder::getCompanyType, companyType);
+//                }
+//            }
+
             // 申泽平台管理员
             // 申泽平台管理员
             if (admin.getId() == 2738) {
             if (admin.getId() == 2738) {
-                companyType = "0";
+                String finalCompanyType = "0";
+                if (StringUtils.isNotEmpty(finalCompanyType)) {
+                    query.nested(q -> q.isNull(TOrder::getCompanyType).or()
+                            .eq(TOrder::getCompanyType, finalCompanyType));
+                }
             }
             }
+
             // 七云平台管理员
             // 七云平台管理员
             if (admin.getId() == 2739) {
             if (admin.getId() == 2739) {
-                companyType = "1";
-            }
-            if (StringUtils.isNotEmpty(companyType)) {
-                if (companyType.equals("0")) {
-                    String finalCompanyType = companyType;
+                String finalCompanyType = "1";
+                if (StringUtils.isNotEmpty(finalCompanyType)) {
                     query.nested(q -> q.isNull(TOrder::getCompanyType).or()
                     query.nested(q -> q.isNull(TOrder::getCompanyType).or()
                             .eq(TOrder::getCompanyType, finalCompanyType));
                             .eq(TOrder::getCompanyType, finalCompanyType));
-                } else {
-                    query.eq(TOrder::getCompanyType, companyType);
                 }
                 }
             }
             }
+
+
             if (StringUtils.isNotEmpty(machineType)) {
             if (StringUtils.isNotEmpty(machineType)) {
                 if (machineType.equals("0")) {
                 if (machineType.equals("0")) {
                     query.nested(q -> q.isNull(TOrder::getMachineType).or()
                     query.nested(q -> q.isNull(TOrder::getMachineType).or()
@@ -235,6 +258,7 @@ public class TOrderController {
                     query.eq(TOrder::getEquipmentId, equipment.getId());
                     query.eq(TOrder::getEquipmentId, equipment.getId());
                 }
                 }
             }
             }
+
             if (StringUtils.isNotEmpty(dateType)) {
             if (StringUtils.isNotEmpty(dateType)) {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 if (dateType.equals("0")) {
                 if (dateType.equals("0")) {
@@ -404,8 +428,15 @@ public class TOrderController {
             return R.ok(pageList);
             return R.ok(pageList);
         };
         };
 
 
-        //1,线下
+        //1,海外
         if (type.equals("1")) {
         if (type.equals("1")) {
+            // 如果是线上 Airwallex
+//            if ("1".equals(isAir)) {
+//
+//            } else {
+//
+//            }
+
             LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
             LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
             if (!userName.equals("admin")) {
             if (!userName.equals("admin")) {
                 if (StringUtils.isNotEmpty(userName)) {
                 if (StringUtils.isNotEmpty(userName)) {
@@ -474,6 +505,45 @@ public class TOrderController {
             if (StringUtils.isNotEmpty(productNo)) {
             if (StringUtils.isNotEmpty(productNo)) {
                 query.eq(TCoinOrder::getProductNo, productNo);
                 query.eq(TCoinOrder::getProductNo, productNo);
             }
             }
+
+            // 申泽平台管理员
+            if (admin.getId() == 2738) {
+//                companyType = "0";
+                String finalCompanyType = "0";
+                if (StringUtils.isNotEmpty(finalCompanyType)) {
+                    query.nested(q -> q.isNull(TCoinOrder::getCompanyType).or()
+                            .eq(TCoinOrder::getCompanyType, finalCompanyType));
+                }
+            }
+            // 七云平台管理员
+            if (admin.getId() == 2739) {
+                String finalCompanyType = "1";
+                if (StringUtils.isNotEmpty(finalCompanyType)) {
+                    query.nested(q -> q.isNull(TCoinOrder::getCompanyType).or()
+                            .eq(TCoinOrder::getCompanyType, finalCompanyType));
+                }
+            }
+
+//            if (StringUtils.isNotEmpty(companyType)) {
+//                if (companyType.equals("0")) {
+//                    String finalCompanyType = companyType;
+//                    query.nested(q -> q.isNull(TCoinOrder::getCompanyType).or()
+//                            .eq(TCoinOrder::getCompanyType, finalCompanyType));
+//                } else {
+//                    query.eq(TCoinOrder::getCompanyType, companyType);
+//                }
+//            }
+
+            // 棉花糖机型 + 爆米花机型
+            if (StringUtils.isNotEmpty(machineType)) {
+                if (machineType.equals("0")) {
+                    query.nested(q -> q.isNull(TCoinOrder::getMachineType).or()
+                            .eq(TCoinOrder::getMachineType, machineType));
+                } else {
+                    query.eq(TCoinOrder::getMachineType, machineType);
+                }
+            }
+
             if (StringUtils.isNotEmpty(clientId)) {
             if (StringUtils.isNotEmpty(clientId)) {
                 TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
                 TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
                 //判断机器是否属于这个登陆账号
                 //判断机器是否属于这个登陆账号
@@ -974,7 +1044,7 @@ public class TOrderController {
     }
     }
 
 
     //查询线上订单
     //查询线上订单
-    @ApiOperation(value = "查询线上订单")
+    @ApiOperation(value = "查询国内线上订单")
     @RequestMapping(value = "/findOrder", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     @RequestMapping(value = "/findOrder", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
     @ResponseBody
     @ResponseBody
     public Object findOrder(String clientId, String sn, String productName, String status, String begin, String end, int pageNumber) {
     public Object findOrder(String clientId, String sn, String productName, String status, String begin, String end, int pageNumber) {

+ 31 - 31
src/main/java/com/szwl/model/query/TOrderParam.java

@@ -1,7 +1,7 @@
 /**
 /**
  * Date:2019-09-23 17:09:15
  * Date:2019-09-23 17:09:15
  * author:吴洪双
  * author:吴洪双
-*/
+ */
 
 
 package com.szwl.model.query;
 package com.szwl.model.query;
 
 
@@ -25,46 +25,46 @@ import java.util.List;
 @Setter
 @Setter
 @ToString
 @ToString
 public class TOrderParam extends TOrder {
 public class TOrderParam extends TOrder {
-	 @CamelCaseToUnderscore
-     @ApiModelProperty(value = "排序,如:id desc")
-     private String orderByClause;
+    @CamelCaseToUnderscore
+    @ApiModelProperty(value = "排序,如:id desc")
+    private String orderByClause;
     @ApiModelProperty(value = "是否distinct")
     @ApiModelProperty(value = "是否distinct")
     private boolean distinct;
     private boolean distinct;
     @ApiModelProperty(value = "分页,展示多少条记录")
     @ApiModelProperty(value = "分页,展示多少条记录")
     private Integer limit;
     private Integer limit;
     @ApiModelProperty(value = "分页,从第几条开始,默认从0开始")
     @ApiModelProperty(value = "分页,从第几条开始,默认从0开始")
     private Integer offset;
     private Integer offset;
-	@ApiModelProperty(value = "分页,展示多少条记录")
-	private Integer size;
-	@ApiModelProperty(value = "分页,第几页")
-	private Integer current;
+    @ApiModelProperty(value = "分页,展示多少条记录")
+    private Integer size;
+    @ApiModelProperty(value = "分页,第几页")
+    private Integer current;
     @ApiModelProperty(value = "主键id 集合,用于批量删除和批量修改")
     @ApiModelProperty(value = "主键id 集合,用于批量删除和批量修改")
     private List primaryKeyList;
     private List primaryKeyList;
     private List<TOrder> entityList;//实体集合,用于批量新增
     private List<TOrder> entityList;//实体集合,用于批量新增
 
 
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createDate_start;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createDate_end;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date modifyDate_start;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date modifyDate_end;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date payDate_start;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date payDate_end;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date refundDate_start;
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date refundDate_end;
-	private String clientId_like;
-	private String createDate_like;
-	private String sn_like;
-	private Integer type_gt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate_start;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate_end;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyDate_start;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyDate_end;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date payDate_start;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date payDate_end;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date refundDate_start;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date refundDate_end;
+    private String clientId_like;
+    private String createDate_like;
+    private String sn_like;
+    private Integer type_gt;
 
 
-	private List equipmentId_inList;
-	private List adminId_inList;
-/*==================================以上是自动生成部分字段======================================*/
+    private List equipmentId_inList;
+    private List adminId_inList;
+    /*==================================以上是自动生成部分字段======================================*/
 
 
 }
 }