Skip to content

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

分销员接口修改

parent fee4c7b0
Showing with 40 additions and 26 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -123,6 +123,7 @@ public class DankuanController { ...@@ -123,6 +123,7 @@ public class DankuanController {
String partner = request.getParameter("partner"); String partner = request.getParameter("partner");
String setMealIndex = request.getParameter("setMealIndex"); String setMealIndex = request.getParameter("setMealIndex");
String imgUrl = request.getParameter("imgUrl"); String imgUrl = request.getParameter("imgUrl");
String sell = request.getParameter("sell");
String filePath = ""; String filePath = "";
String orderSeq = RandomUtil.RandomNumber(20); String orderSeq = RandomUtil.RandomNumber(20);
try{ try{
...@@ -186,13 +187,13 @@ public class DankuanController { ...@@ -186,13 +187,13 @@ public class DankuanController {
Integer insert = orderViewMapper.insert(orderView); Integer insert = orderViewMapper.insert(orderView);
if (webOrderAmount.equals("0") || product.getProductIntroductionPic3().equals("1")) { if (webOrderAmount.equals("0") || product.getProductIntroductionPic3().equals("1")) {
res = createOrder(productId,orderView, partner,filePath,"未下单"); res = createOrder(productId,orderView, partner,filePath,"未下单",sell);
Map<String,Object> map = orderMapper.selectKdOrder(orderSeq); Map<String,Object> map = orderMapper.selectKdOrder(orderSeq);
intelligenceSendOrder.singleBroadSendOrder(map); intelligenceSendOrder.singleBroadSendOrder(map);
Order order =(Order) res.getData(); Order order =(Order) res.getData();
orderV.setOrderRf2(order.getId()); orderV.setOrderRf2(order.getId());
}else { }else {
res = createOrder(productId,orderView, partner,filePath,"未支付"); res = createOrder(productId,orderView, partner,filePath,"未支付",sell);
} }
if (!res.isSuccess()) { if (!res.isSuccess()) {
return ResponseData.error("下单失败，请检查套餐设置!"); return ResponseData.error("下单失败，请检查套餐设置!");
...@@ -221,7 +222,7 @@ public class DankuanController { ...@@ -221,7 +222,7 @@ public class DankuanController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId,String filePath,String orderStatus){ public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId,String filePath,String orderStatus,String sell){
Order order = new Order(); Order order = new Order();
try{ try{
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
...@@ -252,7 +253,7 @@ public class DankuanController { ...@@ -252,7 +253,7 @@ public class DankuanController {
String schoolId = appMapper.selectSchoolId(userId); String schoolId = appMapper.selectSchoolId(userId);
School school = schoolMapper.selectById(schoolId); School school = schoolMapper.selectById(schoolId);
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName()+sell);
order.setHehuorenArea(school.getSubName()); order.setHehuorenArea(school.getSubName());
order.setSignImg(filePath); order.setSignImg(filePath);
...@@ -663,7 +664,7 @@ public class DankuanController { ...@@ -663,7 +664,7 @@ public class DankuanController {
} }
plaintext = plaintext.concat(Constant.ZHANGSHIKEY); plaintext = plaintext.concat(Constant.ZHANGSHIKEY);
String sign = MD5Utils.md5(plaintext).toUpperCase();//md5加密 String sign = MD5Utils.md5(plaintext).toUpperCase();//md5加密
qParams.add(new BasicNameValuePair("sign", sign));//签名，必填 qParams.add(new BasicNameValuePair("sign", sign));//签名，必填
JSONObject resultDataJson = null; JSONObject resultDataJson = null;
try { try {
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -164,6 +164,7 @@ public class RongHeController { ...@@ -164,6 +164,7 @@ public class RongHeController {
String partner = request.getParameter("partner"); String partner = request.getParameter("partner");
String rhTime = request.getParameter("rhTime"); String rhTime = request.getParameter("rhTime");
String setMealIndex = request.getParameter("setMealIndex"); String setMealIndex = request.getParameter("setMealIndex");
String sell = request.getParameter("sell");
String imgUrl = request.getParameter("imgUrl"); String imgUrl = request.getParameter("imgUrl");
String filePath = ""; String filePath = "";
String orderSeq = RandomUtil.RandomNumber(20); String orderSeq = RandomUtil.RandomNumber(20);
...@@ -261,11 +262,11 @@ public class RongHeController { ...@@ -261,11 +262,11 @@ public class RongHeController {
ResponseData<Object> res = null; ResponseData<Object> res = null;
if (webOrderAmount.equals("0") || product.getProductIntroductionPic4().equals("1")) { if (webOrderAmount.equals("0") || product.getProductIntroductionPic4().equals("1")) {
res = createOrder(productId, orderView, partner, rhTime,filePath,"未下单"); res = createOrder(productId, orderView, partner, rhTime,filePath,"未下单",sell);
Order order =(Order) res.getData(); Order order =(Order) res.getData();
orderV.setOrderRf2(order.getKdOrderId()); orderV.setOrderRf2(order.getKdOrderId());
}else { }else {
res = createOrder(productId, orderView, partner, rhTime,filePath,"未支付"); res = createOrder(productId, orderView, partner, rhTime,filePath,"未支付",sell);
} }
if (!res.isSuccess()) { if (!res.isSuccess()) {
...@@ -294,7 +295,7 @@ public class RongHeController { ...@@ -294,7 +295,7 @@ public class RongHeController {
return ResponseData.error("请重新提交"); return ResponseData.error("请重新提交");
} }
public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId, String rhTime,String filePath,String orderStatus){ public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId, String rhTime,String filePath,String orderStatus,String sell){
Order order = new Order(); Order order = new Order();
try { try {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
...@@ -337,7 +338,7 @@ public class RongHeController { ...@@ -337,7 +338,7 @@ public class RongHeController {
String schoolId = appMapper.selectSchoolId(userId); String schoolId = appMapper.selectSchoolId(userId);
School school = schoolMapper.selectById(schoolId); School school = schoolMapper.selectById(schoolId);
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName()+sell);
// order.setPackageId(productId); // order.setPackageId(productId);
order.setHehuorenArea(school.getSubName()); order.setHehuorenArea(school.getSubName());
order.setSignImg(filePath); order.setSignImg(filePath);
......
apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java
...@@ -194,7 +194,8 @@ public class SingleBroadToIntegrateController { ...@@ -194,7 +194,8 @@ public class SingleBroadToIntegrateController {
@RequestParam("contactPhone") String contactPhone, @RequestParam("contactPhone") String contactPhone,
@RequestParam("rhTime") String rhTime, @RequestParam("rhTime") String rhTime,
@RequestParam("hehuorenId") String hehuorenId, @RequestParam("hehuorenId") String hehuorenId,
@RequestParam("imgUrl") String imgUrl) { @RequestParam("imgUrl") String imgUrl,
@RequestParam(value = "sell",required = false) String sell) {
ToIntegrateOrderParam toIntegrateOrderParam = new ToIntegrateOrderParam(); ToIntegrateOrderParam toIntegrateOrderParam = new ToIntegrateOrderParam();
toIntegrateOrderParam.setName(name); toIntegrateOrderParam.setName(name);
toIntegrateOrderParam.setNetNumber(netNumber); toIntegrateOrderParam.setNetNumber(netNumber);
...@@ -319,7 +320,7 @@ public class SingleBroadToIntegrateController { ...@@ -319,7 +320,7 @@ public class SingleBroadToIntegrateController {
order.setHehuorenPhone(selectHehuorenInfo.get("phone").toString()); order.setHehuorenPhone(selectHehuorenInfo.get("phone").toString());
} }
if (selectHehuorenInfo.get("name") != null) { if (selectHehuorenInfo.get("name") != null) {
order.setHehuorenName(selectHehuorenInfo.get("name").toString()); order.setHehuorenName(selectHehuorenInfo.get("name").toString()+sell);
} }
if (selectHehuorenInfo.get("sub_name") != null) { if (selectHehuorenInfo.get("sub_name") != null) {
order.setHehuorenArea(selectHehuorenInfo.get("sub_name").toString()); order.setHehuorenArea(selectHehuorenInfo.get("sub_name").toString());
......
apply-net/src/main/resources/application-local.yml
...@@ -120,9 +120,9 @@ spring: ...@@ -120,9 +120,9 @@ spring:
exprie: 600 exprie: 600
prohibition: 600 prohibition: 600
datasource: datasource:
url: jdbc:mysql://127.0.0.1:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
username: root username: yzzx
password: root password: yzzx123!@#
dynamic: dynamic:
primary: master primary: master
p6spy: true p6spy: true
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -167,7 +167,9 @@ public class PackageNewClothes { ...@@ -167,7 +167,9 @@ public class PackageNewClothes {
, @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("signUrl") String signUrl, @RequestParam("businessNumber") String businessNumber , @RequestParam(value = "idCard") String idCard, @RequestParam("signUrl") String signUrl, @RequestParam("businessNumber") String businessNumber
,@RequestParam(value = "clazz") String clazz, @RequestParam(value = "userSchool") String userSchool,@RequestParam(value = "isFromRh", required = false) String isFromRh) { ,@RequestParam(value = "clazz") String clazz, @RequestParam(value = "userSchool") String userSchool
,@RequestParam(value = "isFromRh", required = false) String isFromRh
,@RequestParam(value = "sell",required = false)String sell) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -253,7 +255,7 @@ public class PackageNewClothes { ...@@ -253,7 +255,7 @@ public class PackageNewClothes {
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
School school=schoolMapper.selectById(schoolId); School school=schoolMapper.selectById(schoolId);
order.setHehuorenArea(school.getSubName()); order.setHehuorenArea(school.getSubName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName()+sell);
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
...@@ -307,7 +309,9 @@ public class PackageNewClothes { ...@@ -307,7 +309,9 @@ public class PackageNewClothes {
, @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("businessNumber") String businessNumber, @RequestParam("signUrl") String signUrl , @RequestParam("businessNumber") String businessNumber, @RequestParam("signUrl") String signUrl
, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) { , @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh
, @RequestParam(value = "sell",required = false) String sell) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
...@@ -386,7 +390,7 @@ public class PackageNewClothes { ...@@ -386,7 +390,7 @@ public class PackageNewClothes {
String schoolId = appMapper.selectSchoolId(partner); String schoolId = appMapper.selectSchoolId(partner);
School school=schoolMapper.selectById(schoolId); School school=schoolMapper.selectById(schoolId);
order.setHehuorenArea(school.getSubName()); order.setHehuorenArea(school.getSubName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName()+sell);
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
...@@ -433,7 +437,9 @@ public class PackageNewClothes { ...@@ -433,7 +437,9 @@ public class PackageNewClothes {
, @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam("address") String address , @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam("address") 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("signUrl") String signUrl , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin,@RequestParam("signUrl") String signUrl
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) { , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh
,@RequestParam(value = "sell",required = false)String sell) {
/** /**
* 办理中+94天内订单判断 * 办理中+94天内订单判断
...@@ -551,7 +557,7 @@ public class PackageNewClothes { ...@@ -551,7 +557,7 @@ public class PackageNewClothes {
order.setUserType(UserType.NEWCUSTOMER.getId()); order.setUserType(UserType.NEWCUSTOMER.getId());
order.setOrderNumber(orderNum); order.setOrderNumber(orderNum);
order.setHehuorenArea(school.getSubName()); order.setHehuorenArea(school.getSubName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName()+sell);
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
List<String> userId = appMapper.selectsupervisorBySchool(schoolId); List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
......
new-user/src/main/java/com/winsun/controller/StartSelectController.java
...@@ -234,6 +234,7 @@ public class StartSelectController { ...@@ -234,6 +234,7 @@ public class StartSelectController {
orderMap.put("site", parameterMap.get("myAddrs")[0].replace("/"," ")); orderMap.put("site", parameterMap.get("myAddrs")[0].replace("/"," "));
orderMap.put("address", parameterMap.get("address")[0]); orderMap.put("address", parameterMap.get("address")[0]);
orderMap.put("partner", parameterMap.get("partner")[0]); orderMap.put("partner", parameterMap.get("partner")[0]);
orderMap.put("sell", parameterMap.get("sell")[0]);
/* 5、更新数据库 */ /* 5、更新数据库 */
saveOrderInfo(orderMap,""); saveOrderInfo(orderMap,"");
...@@ -564,7 +565,7 @@ public class StartSelectController { ...@@ -564,7 +565,7 @@ public class StartSelectController {
order.setHehuorenArea(school.getSubName()); order.setHehuorenArea(school.getSubName());
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName()+orderMap.get("sell"));
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
order.setSupervisorName(sysUser.getName()); order.setSupervisorName(sysUser.getName());
} }
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -250,7 +250,8 @@ public class PackageUpgradeController extends BaseController { ...@@ -250,7 +250,8 @@ public class PackageUpgradeController extends BaseController {
@RequestParam("oldPackage") String oldPackage, @RequestParam("oldPackage") String oldPackage,
@RequestParam("newPackage") String newPackage, @RequestParam("newPackage") String newPackage,
@RequestParam("newPackage_id") String newPackage_id, @RequestParam("newPackage_id") String newPackage_id,
@RequestParam("signUrl") String signUrl) { @RequestParam("signUrl") String signUrl,
@RequestParam(value = "sell",required = false) String sell) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -289,7 +290,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -289,7 +290,7 @@ public class PackageUpgradeController extends BaseController {
List<Map<String,Object>> partnerInfo = userMapper.findPartnerById(partner); List<Map<String,Object>> partnerInfo = userMapper.findPartnerById(partner);
if(!partnerInfo.isEmpty()) { if(!partnerInfo.isEmpty()) {
order.setHehuorenArea(partnerInfo.get(0).get("area").toString()); order.setHehuorenArea(partnerInfo.get(0).get("area").toString());
order.setHehuorenName(partnerInfo.get(0).get("name").toString()); order.setHehuorenName(partnerInfo.get(0).get("name").toString()+sell);
order.setHehuorenSchool(partnerInfo.get(0).get("school").toString()); order.setHehuorenSchool(partnerInfo.get(0).get("school").toString());
order.setHehuorenPhone(partnerInfo.get(0).get("account").toString()); order.setHehuorenPhone(partnerInfo.get(0).get("account").toString());
} }
...@@ -404,7 +405,9 @@ public class PackageUpgradeController extends BaseController { ...@@ -404,7 +405,9 @@ public class PackageUpgradeController extends BaseController {
* @return * @return
*/ */
@RequestMapping(value = "selectPackageUpgrade", method = RequestMethod.POST) @RequestMapping(value = "selectPackageUpgrade", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectPackageUpgrade(@RequestParam("selectOrder") String selectOrder, @RequestParam("verificationCode") String verificationCode, @RequestParam(value = "servId", required = false) String servId) { public ResponseData<Map<String, Object>> selectPackageUpgrade(@RequestParam("selectOrder") String selectOrder,
@RequestParam("verificationCode") String verificationCode,
@RequestParam(value = "servId", required = false) String servId) {
String ver = null; String ver = null;
Wrapper<PackageUpgrade> wrapper = new EntityWrapper(); Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
wrapper.setSqlSelect("serv_id", "cust_name", "user_type", "school_name", "acc_nbr", "acc_nbr2", "cdma_disc_desc", "is_bltc1" wrapper.setSqlSelect("serv_id", "cust_name", "user_type", "school_name", "acc_nbr", "acc_nbr2", "cdma_disc_desc", "is_bltc1"
...@@ -664,7 +667,8 @@ public class PackageUpgradeController extends BaseController { ...@@ -664,7 +667,8 @@ public class PackageUpgradeController extends BaseController {
@RequestParam("kapin")String kapin, // 新卡品 @RequestParam("kapin")String kapin, // 新卡品
@RequestParam("idCard")String idCard, // 身份证号 @RequestParam("idCard")String idCard, // 身份证号
@RequestParam("oldPackage")String oldPackage, // 老卡品 @RequestParam("oldPackage")String oldPackage, // 老卡品
@RequestParam("signUrl")String signUrl){ // 签名 @RequestParam("signUrl")String signUrl, // 签名
@RequestParam(value = "sell",required = false)String sell){
// 短信校验 // 短信校验
Object o = redisTemplate.opsForValue().get(businessNumber); Object o = redisTemplate.opsForValue().get(businessNumber);
...@@ -708,7 +712,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -708,7 +712,7 @@ public class PackageUpgradeController extends BaseController {
order.setHehuorenId(partner); order.setHehuorenId(partner);
if(!partnerInfo.isEmpty()) { if(!partnerInfo.isEmpty()) {
order.setHehuorenArea(partnerInfo.get(0).get("area").toString()); order.setHehuorenArea(partnerInfo.get(0).get("area").toString());
order.setHehuorenName(partnerInfo.get(0).get("name").toString()); order.setHehuorenName(partnerInfo.get(0).get("name").toString()+sell);
order.setHehuorenSchool(partnerInfo.get(0).get("school").toString()); order.setHehuorenSchool(partnerInfo.get(0).get("school").toString());
order.setHehuorenPhone(partnerInfo.get(0).get("account").toString()); order.setHehuorenPhone(partnerInfo.get(0).get("account").toString());
} }
......
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