Skip to content

G
gdtel-gztel-school-center
Commit 7dabd3ce by 陈浩建
Options

小白卡本地配置

parent 0a3bc828
Showing with 67 additions and 13 deletions
common/src/main/java/com/winsun/bean/Order.java
......@@ -399,4 +399,10 @@ public class Order implements Serializable{
*/
@TableField(value = "sign_img")
private String signImg;
/**
* 小白卡配送方式：0：自提 1：省仓配送 2：本地配送（2021-07-21新增字段）
*/
@TableField(value = "is_delivery")
private String isDelivery;
}
common/src/main/java/com/winsun/bean/Package.java
......@@ -107,4 +107,8 @@ public class Package implements Serializable {
*/
private String createUser;
/**
* 小白卡配送方式：0：自提 1：省仓配送 2：本地配送（2021-07-21新增字段）
*/
private int isDelivery;
}
common/src/main/java/com/winsun/utils/XbkUtil.java
......@@ -54,22 +54,29 @@ public class XbkUtil {
*/
public static JSONObject xbkOrderJT0002(String businessNumber, String idCard,
String customerName,String contactNumber,
String xbId ,String netId, String sendCityCode, String custAffress) throws Exception {
String xbId ,String netId, String sendCityCode, String custAffress,String isDelivery){
Map<String, Object> map = new HashMap<>();
map.put("prodId", xbId);
map.put("coUserId", netId);
map.put("phoneNumber", businessNumber);
map.put("isDelivery", "1");
map.put("isDelivery", isDelivery);
if("1".equals(isDelivery)){
map.put("sendCityCode", sendCityCode);
map.put("custAffress", custAffress);
}
map.put("custName", customerName);
map.put("idCardNo", idCard);
map.put("contactNumber", contactNumber);
map.put("sendSms", "0");
map.put("openChannel", "WECHAT");
String type = "JT0002";
try{
JSONObject jsonObject = XbkUtil.xbkCreate(map, type);
return jsonObject;
}catch (Exception e){
log.info("小白卡接口下单失败");
}
return null;
}
/**
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
......@@ -248,6 +248,7 @@ public class PackageNewClothes {
order.setRemarks(remarks);
order.setBusinessNumber(businessNumber);
order.setSignImg(PicturesUtil.uploadPictures(signUrl, orderNum,"signImg"));
order.setIsDelivery("2");
Date date = new Date();
order.setCreateTime(date);
order.setUserType(UserType.NEWCUSTOMER.getId());
......@@ -465,7 +466,6 @@ public class PackageNewClothes {
return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！");
}
if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入");
}
......@@ -489,11 +489,17 @@ public class PackageNewClothes {
return res;
}
/**
* 小白卡省渠/本地配送验证
*/
String isDelivery = aPackage.getIsDelivery()+"";
if(StringUtils.isBlank(isDelivery)){
return ResponseData.error("当前小白卡配送配置错误，请联系客服,谢谢。");
}
/**
* 小白卡下单
*/
JSONObject jsonObject = null;
try {
String[] sites = site.split("/");
String shi = "";
if (sites.length >= 2) {
......@@ -510,7 +516,8 @@ public class PackageNewClothes {
// 根据市获取编号
// jsonObject = JSONObject.parseObject("{\"dataArray\":{\"salesName\":\"29元学霸星卡\",\"createTime\":\"2021-02-26 09:09:16\",\"orderStatus\":\"17\",\"coUserId\":\"245048\",\"orderCode\":\"120210226090852004565\",\"realPrice\":\"50.0\"},\"msg\":\"操作成功\",\"code\":\"0\",\"errorDescription\":\"\"}");
jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
customerName, contactNumber, xbId, netId, code, address);
customerName, contactNumber, xbId, netId, code, address,isDelivery);
log.info("小白卡下单接口调用返回:"+jsonObject.toJSONString());
} catch (Exception e) {
log.error("小白卡下单接口调用异常", e.getMessage());
}
......@@ -568,6 +575,7 @@ public class PackageNewClothes {
}
order.setLzgh(school.getLzgh());
order.setIsDelivery(isDelivery);
Integer insert = orderMapper.insert(order);
String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
log.info("小白卡订单查询短信地址:" + url);
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -500,7 +500,8 @@ public class OrderController extends BaseController {
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("order_status", "待配送");
wrapper.isNotNull("order_id");
wrapper.isNotNull("order_id").or().eq("is_delivery","2");
}else{
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false);
}
......
service-manager/src/main/java/com/winsun/controller/PackageController.java
......@@ -73,13 +73,24 @@ public class PackageController extends BaseController {
* @return
*/
@Permission(menuname = "添加套餐信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertPackage(@RequestParam("id") String id, @RequestParam("packageName") String packageName, @RequestParam("name") String name, @RequestParam("isXbCard") int isXbCard
, @RequestParam("monthFee") String monthFee, @RequestParam("flow") String flow, @RequestParam("voice") String voice
, @RequestParam("xbId") String xbId, @RequestParam("warmTip") String warmTip, @RequestParam("explains") String explains) {
public ResponseData<String> insertPackage(@RequestParam("id") String id
, @RequestParam("packageName") String packageName
, @RequestParam("name") String name
, @RequestParam("isXbCard") int isXbCard
, @RequestParam("isDelivery") int isDelivery
, @RequestParam("monthFee") String monthFee
, @RequestParam("flow") String flow
, @RequestParam("voice") String voice
, @RequestParam("xbId") String xbId
, @RequestParam("warmTip") String warmTip
, @RequestParam("explains") String explains) {
Package aPackage = new Package();
aPackage.setPackageName(packageName);
aPackage.setName(name);
aPackage.setIsXbCard(isXbCard);
if("0".equals(isXbCard)){
aPackage.setIsDelivery(isDelivery);
}
aPackage.setMonthFee(monthFee);
aPackage.setFlow(flow);
aPackage.setVoice(voice);
......@@ -88,7 +99,6 @@ public class PackageController extends BaseController {
aPackage.setExplains(explains);
Integer insert = packageMapper.insert(aPackage);
if (insert == 1) {
EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
packagewrapper.eq("id", aPackage.getId());
String backgroundpath = DEFAULTPATH + aPackage.getId() + "/" + FILENAME;
......@@ -134,9 +144,17 @@ public class PackageController extends BaseController {
* @return
*/
@Permission(menuname = "修改套餐信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePackage(@RequestParam("id") String id, @RequestParam("packageName") String packageName, @RequestParam("name") String name, @RequestParam("isXbCard") String isXbCard
, @RequestParam("monthFee") String monthFee, @RequestParam("flow") String flow, @RequestParam("voice") String voice
, @RequestParam("xbId") String xbId, @RequestParam("warmTip") String warmTip, @RequestParam("explains") String explains) {
public ResponseData<String> updatePackage(@RequestParam("id") String id
, @RequestParam("packageName") String packageName
, @RequestParam("name") String name
, @RequestParam("isXbCard") String isXbCard
, @RequestParam("isDelivery") String isDelivery
, @RequestParam("monthFee") String monthFee
, @RequestParam("flow") String flow
, @RequestParam("voice") String voice
, @RequestParam("xbId") String xbId
, @RequestParam("warmTip") String warmTip
, @RequestParam("explains") String explains) {
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", id);
......@@ -144,6 +162,11 @@ public class PackageController extends BaseController {
dataMapping.put("package_name", packageName);
dataMapping.put("name", name);
dataMapping.put("is_xb_card", isXbCard);
if("0".equals(isXbCard)){
if(isDelivery != null && StringUtils.isNotBlank(isDelivery)){
dataMapping.put("is_delivery", isDelivery);
}
}
dataMapping.put("month_fee", monthFee);
dataMapping.put("flow", flow);
dataMapping.put("voice", voice);
......@@ -184,9 +207,14 @@ public class PackageController extends BaseController {
objects.add("id");
wrapper.orderDesc(objects);
Page<Package> page = new Page<>(pageIndex, pageSize);
try{
List<Package> aPackage = packageMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
return ResponseData.success(page, "查询完毕！");
}catch (Exception e){
log.info("查询套餐信息失败："+e);
}
return ResponseData.error("查询套餐信息失败");
}
@Permission(menuname = "套餐全称列表", value = "packageAllList", method = RequestMethod.POST)
......
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