|
@@ -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();
|
|
}
|
|
}
|