Skip to content

G
gdtel-gztel-school-center
Commit 9057d294 by 黄森林
Options

新需求添加，融合单宽优化

parent 8d9c8598
Showing with 29 additions and 52 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -108,7 +108,7 @@ public class DankuanController { ...@@ -108,7 +108,7 @@ public class DankuanController {
* @throws Exception * @throws Exception
*/ */
@RequestMapping("/createProductOrder") @RequestMapping("/createProductOrder")
public ResponseData<OrderView> createProductOrder(@RequestParam("orderName") String orderName, @RequestParam("orderPhone") String orderPhone, public ResponseData<Object> createProductOrder(@RequestParam("orderName") String orderName, @RequestParam("orderPhone") String orderPhone,
@RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId, @RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId,
@RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd, @RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd,
@RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId, @RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId,
...@@ -179,15 +179,18 @@ public class DankuanController { ...@@ -179,15 +179,18 @@ public class DankuanController {
orderView.setCustomerId("xyzxyql"); orderView.setCustomerId("xyzxyql");
orderView.setOrderCustomerType("学生"); orderView.setOrderCustomerType("学生");
if (webOrderAmount.equals("0")) { if (webOrderAmount.equals("0")) {
ResponseData<OrderView> res = createOrder(orderView, partner, orderSeq); ResponseData<Object> res = createOrder(orderView, partner, orderSeq);
if (!res.isSuccess()) { if (!res.isSuccess()) {
return res; return res;
} }
Order order =(Order) res.getData();
orderV.setOrderRf2(order.getId());
} }
Integer insert = orderViewMapper.insert(orderView); Integer insert = orderViewMapper.insert(orderView);
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId()); orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderView.getOrderSeq()); orderV.setOrderSeq(orderView.getOrderSeq());
orderV.setWebOrderAmount(webOrderAmount);
return ResponseData.success(orderV, "订单提交完成！"); return ResponseData.success(orderV, "订单提交完成！");
} }
return ResponseData.error("提交失败！"); return ResponseData.error("提交失败！");
...@@ -201,7 +204,7 @@ public class DankuanController { ...@@ -201,7 +204,7 @@ public class DankuanController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
public ResponseData<OrderView> createOrder(OrderView orderView, String userId, String orderseq) throws Exception { public ResponseData<Object> createOrder(OrderView orderView, String userId, String orderseq) throws Exception {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1]; String id = uuid.split("-")[0] + uuid.split("-")[1];
Order order = new Order(); Order order = new Order();
...@@ -262,7 +265,7 @@ public class DankuanController { ...@@ -262,7 +265,7 @@ public class DankuanController {
JSONArray saleList = saleJsonObject.getJSONArray("list"); JSONArray saleList = saleJsonObject.getJSONArray("list");
JSONObject itmeJson = JSONObject.parseObject(saleList.get(0).toString()); JSONObject itmeJson = JSONObject.parseObject(saleList.get(0).toString());
saleId = itmeJson.getString("saleId");*/ saleId = itmeJson.getString("saleId");*/
JSONObject submitOrderJsonObject = getOrderInfo(schoolMap, orderView, currentTimeStr, productId, saleId, "", "", "", ""); JSONObject submitOrderJsonObject = getOrderInfo(schoolMap, orderView, currentTimeStr, productId, saleId, "", "00000", "0元", "00000");
String orderNum = (String) submitOrderJsonObject.get("orderNumber"); String orderNum = (String) submitOrderJsonObject.get("orderNumber");
if (StringUtils.isNotBlank(orderNum)) { if (StringUtils.isNotBlank(orderNum)) {
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
...@@ -279,7 +282,7 @@ public class DankuanController { ...@@ -279,7 +282,7 @@ public class DankuanController {
} else { } else {
return ResponseData.error("智能平台订单创建失败，如有疑问请联系客服！"); return ResponseData.error("智能平台订单创建失败，如有疑问请联系客服！");
} }
return ResponseData.success(orderView, "智能平台订单创建成功"); return ResponseData.success(order, "智能平台订单创建成功");
} }
/** /**
...@@ -318,7 +321,6 @@ public class DankuanController { ...@@ -318,7 +321,6 @@ public class DankuanController {
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
wrapper.eq("orderSeq", orderseq);
orderMap = orderViewMapper.selectList(wrapper).get(0); orderMap = orderViewMapper.selectList(wrapper).get(0);
// 根据学校名称，获取该学校信息 // 根据学校名称，获取该学校信息
...@@ -455,7 +457,7 @@ public class DankuanController { ...@@ -455,7 +457,7 @@ public class DankuanController {
//单宽回调后端接口地址 //单宽回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
map.put("BACKDROPURL", "http://yrym.winsun-aly.com/gdtel-xyzx-hhr/paymentCon/toSubmisOrderPreser.do"); map.put("BACKDROPURL", "http://167460x6b0.51mypc.cn/ciop/dankuan/toSubmisOrderPreser.do");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识 String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识
...@@ -699,13 +701,6 @@ public class DankuanController { ...@@ -699,13 +701,6 @@ public class DankuanController {
qParams.add(new BasicNameValuePair("addressCity", "广州市")); //报装地址城市，必填 qParams.add(new BasicNameValuePair("addressCity", "广州市")); //报装地址城市，必填
signMap.put("addressCity", "广州市"); signMap.put("addressCity", "广州市");
qParams.add(new BasicNameValuePair("deliveryProvince", "广东省"));// 配送地址-省，必填
signMap.put("deliveryProvince", "广东省");
qParams.add(new BasicNameValuePair("deliveryCity", "广州市"));// 配送地址-市，必填
signMap.put("deliveryCity", "广州市");
String addressDistrict = null; String addressDistrict = null;
String address = null; String address = null;
String addressID = null; String addressID = null;
...@@ -755,19 +750,11 @@ public class DankuanController { ...@@ -755,19 +750,11 @@ public class DankuanController {
signMap.put("addressDistrict", addressDistrict); signMap.put("addressDistrict", addressDistrict);
qParams.add(new BasicNameValuePair("address", address)); //报装详细地址，必填 qParams.add(new BasicNameValuePair("address", address)); //报装详细地址，必填
signMap.put("address", address); signMap.put("address", address);
qParams.add(new BasicNameValuePair("deliveryDistrict", addressDistrict));// 配送地址-区，必填
signMap.put("deliveryDistrict", addressDistrict);
qParams.add(new BasicNameValuePair("deliveryAddress", address));// 配送地址-详细地址，必填
signMap.put("deliveryAddress", address);
qParams.add(new BasicNameValuePair("deliveryContact", orderMap.getOrderName())); //报装联系人，必填 qParams.add(new BasicNameValuePair("deliveryContact", orderMap.getOrderName())); //报装联系人，必填
signMap.put("deliveryContact", orderMap.getOrderName()); signMap.put("deliveryContact", orderMap.getOrderName());
qParams.add(new BasicNameValuePair("deliveryContactPhone", orderMap.getOrderPhone())); //报装联系电话，必填 qParams.add(new BasicNameValuePair("deliveryContactPhone", orderMap.getOrderPhone())); //报装联系电话，必填
signMap.put("deliveryContactPhone", orderMap.getOrderPhone()); signMap.put("deliveryContactPhone", orderMap.getOrderPhone());
qParams.add(new BasicNameValuePair("invoiced", "0")); //是否需要发票 0：否 1：是，必填 qParams.add(new BasicNameValuePair("invoiced", "0")); //是否需要发票 0：否 1：是，必填
signMap.put("invoiced", "0"); signMap.put("invoiced", "0");
qParams.add(new BasicNameValuePair("invoiceTitle", "")); //若需要发票，发票抬头，必填 qParams.add(new BasicNameValuePair("invoiceTitle", "")); //若需要发票，发票抬头，必填
...@@ -816,34 +803,13 @@ public class DankuanController { ...@@ -816,34 +803,13 @@ public class DankuanController {
paymentMap.put("bank", "");//缴费银行，缴费方式为“银行划账”时必填 ：[中国银行|中国工商银行|中国农业银行|民生银行|招商银行|中信银行|商业银行|广东发展银行|光大银行|华夏银行|兴业银行|浦发银行|广州农村商业银行|广州银行|深圳发展银行|交通银行|中国建设银行|邮政储蓄] paymentMap.put("bank", "");//缴费银行，缴费方式为“银行划账”时必填 ：[中国银行|中国工商银行|中国农业银行|民生银行|招商银行|中信银行|商业银行|广东发展银行|光大银行|华夏银行|兴业银行|浦发银行|广州农村商业银行|广州银行|深圳发展银行|交通银行|中国建设银行|邮政储蓄]
paymentMap.put("bankNumber", "");//银行账号，缴费方式为“银行划账”时必填 paymentMap.put("bankNumber", "");//银行账号，缴费方式为“银行划账”时必填
paymentMap.put("bankOwner", "");////银行账号持有人，缴费方式为“银行划账”时必填 paymentMap.put("bankOwner", "");////银行账号持有人，缴费方式为“银行划账”时必填
String payPlatform = orderMap.getIPay(); paymentMap.put("payPlatform", "");
if (StringUtils.isNotBlank(payPlatform)) { paymentMap.put("electronicPayNumber", "");//支付流水号，缴费方式为“穗易付”时必填
if ("1".equals(payPlatform)) { paymentMap.put("payOrderNumber", "");// 穗易付订单号，若选择穗易付，此项必填
paymentMap.put("payPlatform", "支付宝");//支付平台，缴费方式为“穗易付”时必填
} else {
paymentMap.put("payPlatform", "微信");//支付平台，缴费方式为“穗易付”时必填
}
} else {
paymentMap.put("payPlatform", "穗易付");//支付平台，缴费方式为“穗易付”时必填
}
if (StringUtils.isNotBlank(UPTRANSEQ)) {
paymentMap.put("electronicPayNumber", UPTRANSEQ);//支付流水号，缴费方式为“穗易付”时必填
} else {
paymentMap.put("electronicPayNumber", "");//支付流水号，缴费方式为“穗易付”时必填
}
if (StringUtils.isNotBlank(ORDERREQTRANSEQ)) {
paymentMap.put("payOrderNumber", ORDERREQTRANSEQ);// 穗易付订单号，若选择穗易付，此项必填
} else {
paymentMap.put("payOrderNumber", "");// 穗易付订单号，若选择穗易付，此项必填
}
if (StringUtils.isNotBlank(ORDERAMOUNT)) {
paymentMap.put("payAmount", ORDERAMOUNT);//缴费金额（打款金额），缴费方式为“代理商打款”或“穗易付”时必填
} else {
paymentMap.put("payAmount", "");//缴费金额（打款金额），缴费方式为“代理商打款”或“穗易付”时必填
}
paymentMap.put("alipayUserid", "");//用户ID，缴费方式为“支付宝支付”时必填 paymentMap.put("alipayUserid", "");//用户ID，缴费方式为“支付宝支付”时必填
paymentMap.put("alipayNumber", "");//支付宝账号，缴费方式为“支付宝支付”时必填 paymentMap.put("alipayNumber", "");//支付宝账号，缴费方式为“支付宝支付”时必填
paymentMap.put("alipayAuthNumber", "");//授权协议号，缴费方式为“支付宝支付”时必填 paymentMap.put("alipayAuthNumber", "");//授权协议号，缴费方式为“支付宝支付”时必填
paymentMap.put("payAmount", "");//缴费金额（打款金额），缴费方式为“代理商打款”或“穗易付”时必填
paymentList.add(paymentMap); paymentList.add(paymentMap);
//产品自定义属性；暂时默认属性名称只能传“日租卡号码” //产品自定义属性；暂时默认属性名称只能传“日租卡号码”
Map<String, String> propertyMap = new HashMap<String, String>(); Map<String, String> propertyMap = new HashMap<String, String>();
......
common/src/main/java/com/winsun/bean/Order.java
...@@ -315,6 +315,8 @@ public class Order implements Serializable{ ...@@ -315,6 +315,8 @@ public class Order implements Serializable{
*/ */
private String parentName; private String parentName;
private Date rhTime;
......
common/src/main/java/com/winsun/constant/Constant.java
...@@ -27,7 +27,7 @@ public class Constant { ...@@ -27,7 +27,7 @@ public class Constant {
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号 // public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key // public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismartbak.mini189.cn/api/"; //智能平台提供的正式key public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址 // public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址 // public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -142,7 +142,7 @@ public class PackageNewClothes { ...@@ -142,7 +142,7 @@ public class PackageNewClothes {
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner , @RequestParam("customerName") String customerName, @RequestParam("partner") String partner
, @RequestParam(value = "idCardzs") String idCardzs, @RequestParam(value = "idCardz") String idCardz, @RequestParam(value = "idCardf") String idCardf , @RequestParam(value = "idCardzs") String idCardzs, @RequestParam(value = "idCardz") String idCardz, @RequestParam(value = "idCardf") String idCardf
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool,@RequestParam(value = "isFromRh") String isFromRh) { , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool,@RequestParam(value = "isFromRh", required = false) String isFromRh) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -175,6 +175,9 @@ public class PackageNewClothes { ...@@ -175,6 +175,9 @@ public class PackageNewClothes {
Order order = new Order(); Order order = new Order();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id=uuid.split("-")[0]+uuid.split("-")[1]; String id=uuid.split("-")[0]+uuid.split("-")[1];
if(isFromRh.equals("true")){
order.setUserBussinessType("5");
}
order.setId(id); order.setId(id);
order.setIdCard(idCard); order.setIdCard(idCard);
order.setOrderStatus("待处理"); order.setOrderStatus("待处理");
...@@ -247,7 +250,7 @@ public class PackageNewClothes { ...@@ -247,7 +250,7 @@ public class PackageNewClothes {
, @RequestParam(value = "parentName") String parentName, @RequestParam(value = "idCardf") String idCardf , @RequestParam(value = "parentName") String parentName, @RequestParam(value = "idCardf") String idCardf
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "studentNumber") String studentNumber , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "studentNumber") String studentNumber
, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh") String isFromRh) { , @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
...@@ -282,6 +285,9 @@ public class PackageNewClothes { ...@@ -282,6 +285,9 @@ public class PackageNewClothes {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id=uuid.split("-")[0]+uuid.split("-")[1]; String id=uuid.split("-")[0]+uuid.split("-")[1];
order.setId(id); order.setId(id);
if(isFromRh.equals("true")){
order.setUserBussinessType("5");
}
order.setIdCard(idCard); order.setIdCard(idCard);
order.setOrderStatus("待处理"); order.setOrderStatus("待处理");
order.setUserSchool(userSchool); order.setUserSchool(userSchool);
...@@ -348,7 +354,7 @@ public class PackageNewClothes { ...@@ -348,7 +354,7 @@ public class PackageNewClothes {
, @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam(value = "addRess", required = false) String addRess , @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam(value = "addRess", required = false) String addRess
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber , @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh") String isFromRh) { , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -404,6 +410,9 @@ public class PackageNewClothes { ...@@ -404,6 +410,9 @@ public class PackageNewClothes {
Order order = new Order(); Order order = new Order();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id=uuid.split("-")[0]+uuid.split("-")[1]; String id=uuid.split("-")[0]+uuid.split("-")[1];
if(isFromRh.equals("true")){
order.setUserBussinessType("5");
}
order.setId(id); order.setId(id);
order.setIdCard(idCard); order.setIdCard(idCard);
order.setXbOrderId(map.get("orderCode").toString()); order.setXbOrderId(map.get("orderCode").toString());
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
...@@ -36,7 +36,7 @@ public class OrderTask { ...@@ -36,7 +36,7 @@ public class OrderTask {
} }
@Scheduled(cron = "0 15 10 * * ? ") @Scheduled(cron = "0 0 0 * * ? ")
//@Scheduled(cron = "0/5 * * * * ? ") //@Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/orderTask") @PostMapping("/orderTask")
......
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