|
@@ -50,7 +50,7 @@ import java.util.concurrent.Executors;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
|
- * 服务实现类
|
|
|
+ * 服务实现类
|
|
|
* </p>
|
|
|
*
|
|
|
* @author wuhs
|
|
@@ -64,6 +64,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
SzwlFeign szwlFeign;
|
|
|
|
|
|
private static final String appid = "07784f5fedb508046c841b391005b7de";
|
|
|
+
|
|
|
//首页统计
|
|
|
@Override
|
|
|
public ChartColumn getStatistics(StatisticsParam param) {
|
|
@@ -121,19 +122,19 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
if (ChartType.year.toString().equals(param.getChartType())) {
|
|
|
msg = "年统计";
|
|
|
}
|
|
|
- if("1".equals(param.getChangeType())){
|
|
|
+ if ("1".equals(param.getChangeType())) {
|
|
|
// 花型统计
|
|
|
list = tOrderMapper.getProductNameStatistics(param);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
list = tOrderMapper.getEquipmentStatistics(param);
|
|
|
- if(list.size()>0){
|
|
|
- for(ChartBean chartBean:list){
|
|
|
+ if (list.size() > 0) {
|
|
|
+ for (ChartBean chartBean : list) {
|
|
|
String categorie = chartBean.getCategorie();
|
|
|
TEquipment tEquipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(param.getClientId()));
|
|
|
- if(StringUtils.isNotEmpty(tEquipment.getName())){
|
|
|
+ if (StringUtils.isNotEmpty(tEquipment.getName())) {
|
|
|
chartBean.setCategorie(tEquipment.getName());
|
|
|
- }else {
|
|
|
- chartBean.setCategorie(categorie.substring(categorie.length()-6,categorie.length()));
|
|
|
+ } else {
|
|
|
+ chartBean.setCategorie(categorie.substring(categorie.length() - 6, categorie.length()));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -153,7 +154,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
daoChuParam.setEnd(end);
|
|
|
daoChuParam.setClientId(clientId);
|
|
|
daoChuParam.setType(type);
|
|
|
- daoChuParam.setCurrent(current-1);
|
|
|
+ daoChuParam.setCurrent(current - 1);
|
|
|
daoChuParam.setSize(size);
|
|
|
daoChuParam.setCompanyType(companyType);
|
|
|
return tOrderMapper.getOrderDaoCu(daoChuParam);
|
|
@@ -165,11 +166,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
|
|
|
List<OrderTarget> list1 = new ArrayList<>();
|
|
|
for (TOrder order : list) {
|
|
|
- if(!order.getProductName().equals("优惠码")){
|
|
|
+ if (!order.getProductName().equals("优惠码")) {
|
|
|
OrderTarget orderTarget = new OrderTarget();
|
|
|
orderTarget.setSn(order.getSn());
|
|
|
orderTarget.setProductName(order.getProductName());
|
|
|
- if(order.getRefundAmount() != null) {
|
|
|
+ if (order.getRefundAmount() != null) {
|
|
|
orderTarget.setPrice(order.getPrice().subtract(order.getRefundAmount()).setScale(2));
|
|
|
} else {
|
|
|
orderTarget.setPrice(order.getPrice());
|
|
@@ -177,11 +178,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
orderTarget.setClientId(order.getClientId());
|
|
|
orderTarget.setName(admin.getUsername());
|
|
|
// 格式化时间
|
|
|
- if(order.getPayDate()!=null) {
|
|
|
+ if (order.getPayDate() != null) {
|
|
|
String formatPayDate = DateUtils.formatDate(order.getPayDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
|
|
|
orderTarget.setPayDate(formatPayDate);
|
|
|
}
|
|
|
- if(order.getRefundDate()!=null) {
|
|
|
+ if (order.getRefundDate() != null) {
|
|
|
String formatRefundDate = DateUtils.formatDate(order.getRefundDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
|
|
|
orderTarget.setRefundDate(formatRefundDate);
|
|
|
}
|
|
@@ -196,30 +197,30 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
orderTarget.setStatus(String.valueOf(status));
|
|
|
}
|
|
|
|
|
|
- if (order.getAgencyProportion()!=null) {
|
|
|
+ if (order.getAgencyProportion() != null) {
|
|
|
orderTarget.setAgencyProportion(String.valueOf(order.getAgencyProportion()));
|
|
|
}
|
|
|
- if (order.getMerchantProportion()!=null) {
|
|
|
+ if (order.getMerchantProportion() != null) {
|
|
|
orderTarget.setMerchantProportion(String.valueOf(order.getMerchantProportion()));
|
|
|
}
|
|
|
- if (order.getPersonageProportion()!=null) {
|
|
|
+ if (order.getPersonageProportion() != null) {
|
|
|
orderTarget.setPersonageProportion(String.valueOf(order.getPersonageProportion()));
|
|
|
}
|
|
|
|
|
|
if ("WEIXIN_NATIVE".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("微信主扫支付");
|
|
|
- } else if("ALIPAY_NATIVE".equals(order.getFrpCode())){
|
|
|
+ } else if ("ALIPAY_NATIVE".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("支付宝主扫支付");
|
|
|
- }else if("WEIXIN_CARD".equals(order.getFrpCode())){
|
|
|
+ } else if ("WEIXIN_CARD".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("微信被扫支付");
|
|
|
- }else if("ALIPAY_CARD".equals(order.getFrpCode())){
|
|
|
+ } else if ("ALIPAY_CARD".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("支付宝被扫支付");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
orderTarget.setFrp_code(order.getFrpCode());
|
|
|
}
|
|
|
|
|
|
|
|
|
- if(StringUtils.isEmpty(orderTarget.getFrp_code())){
|
|
|
+ if (StringUtils.isEmpty(orderTarget.getFrp_code())) {
|
|
|
orderTarget.setFrp_code(order.getFrpCode());
|
|
|
}
|
|
|
list1.add(orderTarget);
|
|
@@ -230,39 +231,39 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
|
|
|
@Override
|
|
|
public List<OrderStatisticsDTO> findByTime(String clientId, Date startTime, Date endTime, Integer unit) {
|
|
|
- return tOrderMapper.findByTime(clientId,startTime,endTime,unit);
|
|
|
+ return tOrderMapper.findByTime(clientId, startTime, endTime, unit);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public String setMessage(Long id, String customerPhone) {
|
|
|
TOrder order = tOrderMapper.selectById(id);
|
|
|
String result = "";
|
|
|
- if(order != null) {
|
|
|
+ if (order != null) {
|
|
|
String companyType = order.getCompanyType();
|
|
|
String clientId = order.getClientId();
|
|
|
String sn = order.getSn();
|
|
|
TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
|
|
|
if (equipment == null) {
|
|
|
- return "设备不存在";
|
|
|
+ return "设备不存在";
|
|
|
}
|
|
|
String operationalPhone = equipment.getOperationalPhone();
|
|
|
String phone = null;
|
|
|
//判断是否有机器运营者,作为短信接收通知人
|
|
|
- if(!StringUtils.isEmpty(operationalPhone)){
|
|
|
+ if (!StringUtils.isEmpty(operationalPhone)) {
|
|
|
//直接发送到机器运营者
|
|
|
phone = operationalPhone;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
//直接发送到账户拥有者手机
|
|
|
TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(equipment.getAdminId())));
|
|
|
- if(admin != null){
|
|
|
- if(!StringUtils.isEmpty(admin.getPhone())){
|
|
|
+ if (admin != null) {
|
|
|
+ if (!StringUtils.isEmpty(admin.getPhone())) {
|
|
|
phone = admin.getPhone();
|
|
|
}
|
|
|
} else {
|
|
|
return "账户不存在";
|
|
|
}
|
|
|
}
|
|
|
- if(!StringUtils.isEmpty(phone)){
|
|
|
+ if (!StringUtils.isEmpty(phone)) {
|
|
|
//发短信
|
|
|
try {
|
|
|
String price = String.valueOf(order.getPrice());
|
|
@@ -295,11 +296,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
public List<NewOrderTarget> exportOrderData(TAdmin admin, List<TOrder> list) {
|
|
|
List<NewOrderTarget> orderTargets = new ArrayList<>();
|
|
|
for (TOrder order : list) {
|
|
|
- if(!order.getProductName().equals("优惠码")){
|
|
|
+ if (!order.getProductName().equals("优惠码")) {
|
|
|
NewOrderTarget orderTarget = new NewOrderTarget();
|
|
|
orderTarget.setSn(order.getSn());
|
|
|
orderTarget.setProductName(order.getProductName());
|
|
|
- if(order.getRefundAmount() != null) {
|
|
|
+ if (order.getRefundAmount() != null) {
|
|
|
orderTarget.setPrice(order.getPrice().subtract(order.getRefundAmount()).setScale(2));
|
|
|
} else {
|
|
|
orderTarget.setPrice(order.getPrice());
|
|
@@ -307,11 +308,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
orderTarget.setClientId(order.getClientId());
|
|
|
orderTarget.setName(admin.getUsername());
|
|
|
// 格式化时间
|
|
|
- if(order.getPayDate()!=null) {
|
|
|
+ if (order.getPayDate() != null) {
|
|
|
String formatPayDate = DateUtils.formatDate(order.getPayDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
|
|
|
orderTarget.setPayDate(formatPayDate);
|
|
|
}
|
|
|
- if(order.getRefundDate()!=null) {
|
|
|
+ if (order.getRefundDate() != null) {
|
|
|
String formatRefundDate = DateUtils.formatDate(order.getRefundDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
|
|
|
orderTarget.setRefundDate(formatRefundDate);
|
|
|
}
|
|
@@ -326,30 +327,30 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
orderTarget.setStatus(String.valueOf(status));
|
|
|
}
|
|
|
|
|
|
- if (order.getAgencyProportion()!=null) {
|
|
|
+ if (order.getAgencyProportion() != null) {
|
|
|
orderTarget.setAgencyProportion(String.valueOf(order.getAgencyProportion()));
|
|
|
}
|
|
|
- if (order.getMerchantProportion()!=null) {
|
|
|
+ if (order.getMerchantProportion() != null) {
|
|
|
orderTarget.setMerchantProportion(String.valueOf(order.getMerchantProportion()));
|
|
|
}
|
|
|
- if (order.getPersonageProportion()!=null) {
|
|
|
+ if (order.getPersonageProportion() != null) {
|
|
|
orderTarget.setPersonageProportion(String.valueOf(order.getPersonageProportion()));
|
|
|
}
|
|
|
|
|
|
if ("WEIXIN_NATIVE".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("微信主扫支付");
|
|
|
- } else if("ALIPAY_NATIVE".equals(order.getFrpCode())){
|
|
|
+ } else if ("ALIPAY_NATIVE".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("支付宝主扫支付");
|
|
|
- }else if("WEIXIN_CARD".equals(order.getFrpCode())){
|
|
|
+ } else if ("WEIXIN_CARD".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("微信被扫支付");
|
|
|
- }else if("ALIPAY_CARD".equals(order.getFrpCode())){
|
|
|
+ } else if ("ALIPAY_CARD".equals(order.getFrpCode())) {
|
|
|
orderTarget.setFrp_code("支付宝被扫支付");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
orderTarget.setFrp_code(order.getFrpCode());
|
|
|
}
|
|
|
|
|
|
|
|
|
- if(StringUtils.isEmpty(orderTarget.getFrp_code())){
|
|
|
+ if (StringUtils.isEmpty(orderTarget.getFrp_code())) {
|
|
|
orderTarget.setFrp_code(order.getFrpCode());
|
|
|
}
|
|
|
orderTargets.add(orderTarget);
|
|
@@ -555,34 +556,34 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
executorService.shutdown();
|
|
|
}
|
|
|
|
|
|
- private String getSzMessage(String sn, String price, String payTime,String equipmentName,String clientId,String customerPhone) {
|
|
|
+ private String getSzMessage(String sn, String price, String payTime, String equipmentName, String clientId, String customerPhone) {
|
|
|
String message = "";
|
|
|
- if(StringUtils.isNotEmpty(customerPhone)&&customerPhone.length()>3){
|
|
|
- message = "【申泽智能】您好,接到消费者投诉:机器做糖出现问题,需要您退款。订单号:"
|
|
|
- +sn+",机器名称:"+equipmentName+",设备编号:"+clientId+
|
|
|
- ",价格:"+price+"元,订单支付时间:"+payTime+",消费者联系方式:"+customerPhone+
|
|
|
- "。如果已通过私下退款的方式,麻烦提供一下退款截屏到群里。请于24小时内将此订单进行退款处理,过后我司将自行帮您进行退款处理,若超过5次超时处理,可能会有冻结银行卡的风险,谢谢配合。";
|
|
|
- }else {
|
|
|
- message = "【申泽智能】您好,接到消费者投诉:机器做糖出现问题,需要您退款。订单号:"
|
|
|
- +sn+",机器名称:"+equipmentName+",设备编号:"+clientId+
|
|
|
- ",价格:"+price+"元,订单支付时间:"+payTime+",该投诉消费者没有留联系方式,如需核实,请把你的联系方式反馈给我们,我们会把你的联系方式通知到消费者手上,让消费者联系您。" +
|
|
|
- "如果已通过私下退款的方式,麻烦提供一下退款截屏到群里。请于24小时内将此订单进行退款处理,过后我司将自行帮您进行退款处理,若超过5次超时处理,可能会有冻结银行卡的风险,谢谢配合。";
|
|
|
+ if (StringUtils.isNotEmpty(customerPhone) && customerPhone.length() > 3) {
|
|
|
+ message = "【申泽智能】您好,接到消费者投诉:机器售卖出现问题,需要您退款。订单号:"
|
|
|
+ + sn + ",机器名称:" + equipmentName + ",设备编号:" + clientId +
|
|
|
+ ",价格:" + price + "元,订单支付时间:" + payTime + ",消费者联系方式:" + customerPhone +
|
|
|
+ "。如已通过私下退款,请提供退款截屏到群里,务必24小时内将此订单进行退款处理,否则我司将自动执行退款流程,以保障您的银行账户不被冻结,谢谢。";
|
|
|
+ } else {
|
|
|
+ message = "【申泽智能】您好,接到消费者投诉:机器售卖出现问题,需要您退款。订单号:"
|
|
|
+ + sn + ",机器名称:" + equipmentName + ",设备编号:" + clientId +
|
|
|
+ ",价格:" + price + "元,订单支付时间:" + payTime + ",该投诉消费者没有留联系方式,如需核实,请把你的联系方式反馈给我们,我们会把你的联系方式通知到消费者手上,让消费者联系您。" +
|
|
|
+ "如已通过私下退款,请提供退款截屏到群里,务必24小时内将此订单进行退款处理,否则我司将自动执行退款流程,以保障您的银行账户不被冻结,谢谢。";
|
|
|
}
|
|
|
return message;
|
|
|
}
|
|
|
|
|
|
- private String getScMessage(String sn, String price, String payTime,String equipmentName,String clientId,String customerPhone) {
|
|
|
+ private String getScMessage(String sn, String price, String payTime, String equipmentName, String clientId, String customerPhone) {
|
|
|
String message = "";
|
|
|
- if(StringUtils.isNotEmpty(customerPhone)&&customerPhone.length()>3){
|
|
|
- message = "【七云科技】您好,接到消费者投诉:机器做糖出现问题,需要您退款。订单号:"
|
|
|
- +sn+",机器名称:"+equipmentName+",设备编号:"+clientId+
|
|
|
- ",价格:"+price+"元,订单支付时间:"+payTime+",消费者联系方式:"+customerPhone+
|
|
|
- "。如果已通过私下退款的方式,麻烦提供一下退款截屏到群里。请于24小时内将此订单进行退款处理,过后我司将自行帮您进行退款处理,若超过5次超时处理,可能会有冻结银行卡的风险,谢谢配合。";
|
|
|
- }else {
|
|
|
- message = "【七云科技】您好,接到消费者投诉:机器做糖出现问题,需要您退款。订单号:"
|
|
|
- +sn+",机器名称:"+equipmentName+",设备编号:"+clientId+
|
|
|
- ",价格:"+price+"元,订单支付时间:"+payTime+",该投诉消费者没有留联系方式,如需核实,请把你的联系方式反馈给我们,我们会把你的联系方式通知到消费者手上,让消费者联系您。" +
|
|
|
- "如果已通过私下退款的方式,麻烦提供一下退款截屏到群里。请于24小时内将此订单进行退款处理,过后我司将自行帮您进行退款处理,若超过5次超时处理,可能会有冻结银行卡的风险,谢谢配合。";
|
|
|
+ if (StringUtils.isNotEmpty(customerPhone) && customerPhone.length() > 3) {
|
|
|
+ message = "【七云科技】您好,接到消费者投诉:机器售卖出现问题,需要您退款。订单号:"
|
|
|
+ + sn + ",机器名称:" + equipmentName + ",设备编号:" + clientId +
|
|
|
+ ",价格:" + price + "元,订单支付时间:" + payTime + ",消费者联系方式:" + customerPhone +
|
|
|
+ "。如已通过私下退款,请提供退款截屏到群里,务必24小时内将此订单进行退款处理,否则我司将自动执行退款流程,以保障您的银行账户不被冻结,谢谢。";
|
|
|
+ } else {
|
|
|
+ message = "【七云科技】您好,接到消费者投诉:机器售卖出现问题,需要您退款。订单号:"
|
|
|
+ + sn + ",机器名称:" + equipmentName + ",设备编号:" + clientId +
|
|
|
+ ",价格:" + price + "元,订单支付时间:" + payTime + ",该投诉消费者没有留联系方式,如需核实,请把你的联系方式反馈给我们,我们会把你的联系方式通知到消费者手上,让消费者联系您。" +
|
|
|
+ "如已通过私下退款,请提供退款截屏到群里,务必24小时内将此订单进行退款处理,否则我司将自动执行退款流程,以保障您的银行账户不被冻结,谢谢。";
|
|
|
}
|
|
|
return message;
|
|
|
}
|