Skip to content

G
gdtel-gztel-school-center
Commit 3555d727 by 伍思炜
Options

中台下单参数调整

parent 83ea7190
Showing with 101 additions and 39 deletions
common/src/main/java/com/winsun/bean/EasyPay.java 0 → 100644
package com.winsun.bean;
import lombok.Data;
import java.io.Serializable;
@Data
public class EasyPay implements Serializable {
private String 穗易付订单号;
private String 穗易付支付流水号;
private String 穗易付支付平台;
private String 穗易付支付金额;
}
common/src/main/java/com/winsun/mapper/RhPhoneMapper.java
......@@ -3,10 +3,15 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.KdyList;
import com.winsun.bean.RhPhone;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.DeleteMapping;
@Mapper
@Component
public interface RhPhoneMapper extends BaseMapper<RhPhone> {
@Delete("delete from hhr_kd_phone where phone = #{phone}")
void deletePhone(@Param("phone") String phone);
}
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
......@@ -164,7 +164,7 @@ public class IntelligenceSendOrders {
}
//例： productName = "校园宽带30元";
System.out.println("------" + productName);
schoolMap = setPriceIndex(schoolMap, orderMap, ORDERAMOUNT);
schoolMap = setPriceIndex(schoolMap, orderViewMap, ORDERAMOUNT);
// 3、提交订单到智能平台
......@@ -193,7 +193,8 @@ public class IntelligenceSendOrders {
orderWrapper.eq("kd_order_id", orderMap.get("kd_order_id"));
Order updateOrder = new Order();
updateOrder.setOrderStatus("待处理");
updateOrder.setMsg(submitOrderJsonObject.getBody());
// updateOrder.setMsg("下单异常");
// updateOrder.setCheckFail(submitOrderJsonObject.getParsingError().toString());
orderMapper.update(updateOrder, orderWrapper);
}
......@@ -228,7 +229,7 @@ public class IntelligenceSendOrders {
Wrapper<Order> orderWrapper = new EntityWrapper<>();
orderWrapper.eq("kd_order_id", orderMap.get("kd_order_id"));
Order updateOrder = new Order();
updateOrder.setMsg((String) orderStatus.get("订单当前状态|状态备注"));
updateOrder.setMsg((String) orderStatus.get("订单状态名称"));
orderMapper.update(updateOrder, orderWrapper);
}
} else {
......@@ -453,6 +454,22 @@ public class IntelligenceSendOrders {
AddressID.setValue(addressID);
attributeList.add(AddressID);
AttributeList type = new AttributeList();
if (businessType == 3){
type.setName("单宽带");
if (((String) orderViewMap.get("orderSetMeal")).contains("包年")) {
type.setValue("校园宽带300元/年.");
} else if (((String) orderViewMap.get("orderSetMeal")).contains("包月")) {
type.setValue("校园宽带30元/月.");
} else {
type.setValue("校园宽带（免月租）.");
}
}else if (businessType == 10){
type.setName("提速包");
type.setValue(schoolMap.get("identifying").toString());
}
attributeList.add(type);
AttributeList internetType = new AttributeList();
internetType.setName("允许上网终端类型");
internetType.setValue(universityTerminalType);
......@@ -558,7 +575,9 @@ public class IntelligenceSendOrders {
HashMap<Object, Object> monthlyFeeItems = new HashMap<>(); //月租费用项
List<HashMap<String, Object>> expenseItemsList = new ArrayList<>(); //费用项列表
// List<HashMap<String, Object>> suipayPayment = new ArrayList<>(); //穗易付支付
HashMap<String, Object> expenseItemsMap = new HashMap<>();
// HashMap<String, Object> suipayPaymentMap = new HashMap<>();
expenseItemsMap.put("费用项名称", productName);
expenseItemsMap.put("费用项金额", "00.0000");
if (((String) orderViewMap.get("orderSetMeal")).contains("包月")) {
......@@ -573,19 +592,23 @@ public class IntelligenceSendOrders {
monthlyFeeItems.put("缴费方式", "现金支付");
} else {
monthlyFeeItems.put("缴费方式", "穗易付");
expenseItemsMap.put("穗易付订单号", "00000000000000");
String payPlatform = (String) orderViewMap.get("ipay");
EasyPay easyPay = new EasyPay();
easyPay.set穗易付订单号(ORDERREQTRANSEQ);
// suipayPaymentMap.put("穗易付订单号", ORDERREQTRANSEQ);
String payPlatform = (String) orderViewMap.get("iPay");
if (StringUtils.isNotBlank(payPlatform)) {
if ("1".equals(payPlatform)) {
expenseItemsMap.put("穗易付支付平台", "支付宝"); // 支付平台，缴费方式为“穗易付”时必填
easyPay.set穗易付支付平台( "支付宝"); // 支付平台，缴费方式为“穗易付”时必填
} else {
expenseItemsMap.put("穗易付支付平台", "微信"); // 支付平台，缴费方式为“穗易付”时必填
easyPay.set穗易付支付平台("微信"); // 支付平台，缴费方式为“穗易付”时必填
}
} else {
expenseItemsMap.put("穗易付支付平台", "穗易付"); // 支付平台，缴费方式为“穗易付”时必填
easyPay.set穗易付支付平台("翼支付"); // 支付平台，缴费方式为“穗易付”时必填
}
expenseItemsMap.put("穗易付支付金额", "0");
expenseItemsMap.put("穗易付支付流水号", "0000000000000000000000");
easyPay.set穗易付支付金额(ORDERAMOUNT);
easyPay.set穗易付支付流水号(UPTRANSEQ);
// suipayPayment.add(suipayPaymentMap);
monthlyFeeItems.put("穗易付支付", easyPay);
}
expenseItemsList.add(expenseItemsMap);
monthlyFeeItems.put("费用项列表", expenseItemsList);
......@@ -594,9 +617,16 @@ public class IntelligenceSendOrders {
HashMap<Object, Object> OneExpenseItems = new HashMap<>(); //一次性费用项
List<HashMap<String, Object>> OneExpenseItemsList = new ArrayList<>(); //费用项列表
List<HashMap<String, Object>> OneSuipayPayment = new ArrayList<>(); //穗易付支付
HashMap<String, Object> OneExpenseItemsMap = new HashMap<>();
HashMap<String, Object> OneSuipayPaymentMap = new HashMap<>();
OneExpenseItemsMap.put("费用项名称", productName);
OneExpenseItemsMap.put("费用项金额", ORDERAMOUNT + ".0000");
if (((String) orderViewMap.get("orderSetMeal")).contains("包月")) {
OneExpenseItemsMap.put("费用项类型", "月租");
} else if (((String) orderViewMap.get("orderSetMeal")).contains("包年")) {
OneExpenseItemsMap.put("费用项类型", "年租");
}
ORDERAMOUNT = ORDERAMOUNT.replace("元", "");
if (ORDERAMOUNT.equals("0.01") || ORDERAMOUNT.equals("0.02")) {
OneExpenseItems.put("缴费方式", "现金支付"); // 缴费方式，必填（例：payType：1）；1：银行划账2：现金支付3：代理商打款4：穗易付5：原套餐缴费方式6：支付宝划扣8：装维上门收取
......@@ -604,19 +634,21 @@ public class IntelligenceSendOrders {
OneExpenseItems.put("缴费方式", "现金支付");
} else {
OneExpenseItems.put("缴费方式", "穗易付");
OneExpenseItemsMap.put("穗易付订单号", ORDERREQTRANSEQ);
String payPlatform = (String) orderViewMap.get("ipay");
EasyPay easyPay = new EasyPay();
easyPay.set穗易付订单号(ORDERREQTRANSEQ);
String payPlatform = (String) orderViewMap.get("iPay");
if (StringUtils.isNotBlank(payPlatform)) {
if ("1".equals(payPlatform)) {
OneExpenseItemsMap.put("穗易付支付平台", "支付宝"); // 支付平台，缴费方式为“穗易付”时必填
easyPay.set穗易付支付平台("支付宝"); // 支付平台，缴费方式为“穗易付”时必填
} else {
OneExpenseItemsMap.put("穗易付支付平台", "微信"); // 支付平台，缴费方式为“穗易付”时必填
easyPay.set穗易付支付平台("微信"); // 支付平台，缴费方式为“穗易付”时必填
}
} else {
OneExpenseItemsMap.put("穗易付支付平台", "穗易付"); // 支付平台，缴费方式为“穗易付”时必填
easyPay.set穗易付支付平台("翼支付"); // 支付平台，缴费方式为“穗易付”时必填
}
OneExpenseItemsMap.put("穗易付支付金额", ORDERAMOUNT);
OneExpenseItemsMap.put("穗易付支付流水号", UPTRANSEQ);
easyPay.set穗易付支付金额(ORDERAMOUNT);
easyPay.set穗易付支付流水号(UPTRANSEQ);
OneExpenseItems.put("穗易付支付", easyPay);
}
OneExpenseItemsList.add(OneExpenseItemsMap);
OneExpenseItems.put("费用项列表", OneExpenseItemsList);
......@@ -689,6 +721,7 @@ public class IntelligenceSendOrders {
private Map<String, Object> setPriceIndex(Map<String, Object> schoolMap, Map<String, Object> orderMap, String ORDERAMOUNT) {
try {
// 获取金额下标
System.out.println(orderMap.get("setMealIndex"));
if (schoolMap.get("universityMonthlyRentType") != null && orderMap.get("setMealIndex") != null) {
Integer index = 0;
String setMealIndex = orderMap.get("setMealIndex").toString();
......@@ -753,6 +786,7 @@ public class IntelligenceSendOrders {
log.info("提交参数:" + data);
Constant.trustEveryone();
kong.unirest.HttpResponse<String> responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data)
//kong.unirest.HttpResponse<String> responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
.header("Content-Type", "application/json")
.header("X-Sign", sign)
.asString();
......@@ -881,7 +915,7 @@ public class IntelligenceSendOrders {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String currentTimeStr = simpleDateFormat.format(new Date());
schoolMap = setPriceIndex(schoolMap, orderMap, ORDERAMOUNT);
schoolMap = setPriceIndex(schoolMap, orderViewMap, ORDERAMOUNT);
kong.unirest.HttpResponse<String> submitOrderJsonObject = null;
......@@ -957,8 +991,8 @@ public class IntelligenceSendOrders {
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", orderMap.get("id"));
Order updateOrder = new Order();
updateOrder.setOrderStatus("异常单");
updateOrder.setMsg(msg);
updateOrder.setOrderStatus("待处理");
updateOrder.setCheckFail(msg);
orderMapper.update(updateOrder, wrapper);
OrderHistory orderHistory = new OrderHistory();
......@@ -1015,12 +1049,12 @@ public class IntelligenceSendOrders {
RestTemplate restTemplate = new RestTemplate();
log.info("提交参数:" + data);
Constant.trustEveryone();
//responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data)
responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data)
//responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
.header("Content-Type", "application/json")
.header("X-Sign", sign)
.asString();
log.info("宽带订单状态查询接口，返回信息:" + responese.getBody());
log.info("订单状态查询接口，返回信息:" + responese.getBody());
JSONObject bodyJsonObject = JSONObject.parseObject(responese.getBody());
Map<String, Object> map = JSONObject.parseObject(bodyJsonObject.getString("data"));
List<Object> list = (List<Object>) map.get("q");
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -1793,9 +1793,9 @@ public class OrderController extends BaseController {
map1.put("cardType", orderData.getKapin());
if ("49".equals(orderData.getPackageId())) {
//map1.put("userName", orderData.getParentName());
map1.put("userName", orderData.getParentName());
map1.put("idCardUrl4", orderData.getIdCardzs().replace("manager", "app"));
map1.put("idCardUrl4", orderData.getIdCardzs());
//map1.put("idCardUrl4", orderData.getIdCardzs());
} else {
map1.put("userName", orderData.getCustomerName());
map1.put("idCardUrl4", orderData.getStudenCard().replace("manager", "app"));
......
service-manager/src/main/java/com/winsun/controller/RhPhoneController.java
......@@ -136,9 +136,13 @@ public class RhPhoneController extends BaseController {
RhPhone rhPhone=new RhPhone();
Map<String, Object> map = listMap.get(i);
rhPhone.setPhone(map.get("a").toString());
Wrapper<RhPhone> wrapper = new EntityWrapper<>();
wrapper.eq("phone",rhPhone);
rhPhoneMapper.delete(wrapper);
rhPhoneMapper.deletePhone(map.get("a").toString());
//rhPhoneMapper.insert(rhPhone);
}
for (int i = 0; i < listMap.size(); i++) {
RhPhone rhPhone=new RhPhone();
Map<String, Object> map = listMap.get(i);
rhPhone.setPhone(map.get("a").toString());
rhPhoneMapper.insert(rhPhone);
}
return ResponseData.success(error.toString(), "导入完成");
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
......@@ -117,20 +117,21 @@ public class OrderTask {
// 未获取到需要的状态不做更新
if ("物流待配送".equals(orderStatus.get("订单状态名称")) || "物流配送中".equals(orderStatus.get("订单状态名称"))
|| "配送成功【待收费】".equals(orderStatus.get("订单状态名称")) || "归档".equals(orderStatus.get("订单状态名称"))) {
|| "配送成功【待收费】".equals(orderStatus.get("订单状态名称")) || "归档".equals(orderStatus.get("订单状态名称"))
|| "待用户号卡实名中".equals(orderStatus.get("订单状态名称"))) {
orderHistory.setStatus("审核通过,等待配送");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("待配送");
update.setMsg(json.get("stateName").toString());
update.setMsg(orderStatus.get("订单状态名称").toString());
orderMapper.updateById(update);
} else if (orderStatus.get("订单状态名称").equals("待图片审核") || orderStatus.get("订单状态名称").equals("作废")) {
orderHistory.setStatus(orderStatus.get("订单状态名称") + ";" + orderStatus.get("stateName"));
orderHistoryMapper.insert(orderHistory);
update.setThStatus(json.get("stateName").toString());
update.setMsg(json.getString("stateName"));
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setMsg(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("异常单");
orderMapper.updateById(update);
}
......@@ -195,7 +196,7 @@ public class OrderTask {
*/
@Scheduled(cron = "0 0/5 * * * ?")
public void updateStatus() throws Exception {
log.info("更新宽带和预制卡状态开始");
// 获取审核中的订单
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_status", "审核中");
......@@ -220,6 +221,7 @@ public class OrderTask {
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台状态获取");
JSONObject json = JSONObject.parseObject(boday);
Map<String, Object> map = JSONObject.parseObject(json.getString("data"));
List<Object> list = (List<Object>) map.get("q");
......@@ -227,7 +229,7 @@ public class OrderTask {
Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
// 未获取到需要的状态不做更新
if ("归档".equals(orderStatus.get("订单状态名称")) || "受理完成待竣工".equals(json.getString("orderStatus"))) {
if ("归档".equals(orderStatus.get("订单状态名称").toString()) || "受理成功待竣工".equals(orderStatus.get("订单状态名称").toString())) {
orderHistory.setStatus("订单已完成");
orderHistoryMapper.insert(orderHistory);
......@@ -246,21 +248,22 @@ public class OrderTask {
SendSmsAndMail.sendSms(order.getContactNumber(),
order.getNetNumber(),
order.getNetPassword(), "12");
} else if ("作废".equals(orderStatus.get("订单状态名称")) || "下单异常".equals(orderStatus.get("订单状态名称"))) {
} else if ("作废".equals(orderStatus.get("订单状态名称").toString()) || "下单异常".equals(orderStatus.get("订单状态名称").toString())
|| "待下单人修改".equals(orderStatus.get("订单状态名称").toString())) {
orderHistory.setStatus("订单异常请联系管理员");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(json.get("orderStatus").toString());
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("异常单");
update.setMsg(json.get("stateName").toString());
update.setMsg(orderStatus.get("订单状态名称").toString());
orderMapper.updateById(update);
}
}
}
}
log.info("更新宽带和预制卡状态结束");
}
@Scheduled(cron = "0 0/5 * * * ?")
//@Scheduled(cron = "0 0/5 * * * ?")
public void updateStatus2() throws Exception {
// 获取审核中的订单
......
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
......@@ -108,6 +108,7 @@ public class RhZhiNenTask {
Map<String, Object> map = new HashMap<>();
// 发送下单请求
for(int i = 0; i < orders.size(); ++i) {
System.out.println(orders.get(i).get("id"));
intelligenceSendOrders.integrateSendOrder(orders.get(i), false);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment