xhxu 5 лет назад
Родитель
Сommit
c98605ac4b
3 измененных файлов: 52 добавлений и 36 удалений
  1. +8
    -7
      mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java
  2. +43
    -28
      mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java
  3. +1
    -1
      mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java

+ 8
- 7
mallinkPublicApi/src/main/java/com/iformall/controller/UserBasicInfoController.java Просмотреть файл

@@ -46,10 +46,10 @@ public class UserBasicInfoController extends BaseController {
@ApiOperation(value = "会员", notes = "") @ApiOperation(value = "会员", notes = "")
public ResultData userRegister(@RequestBody Map<String,Object> map) { public ResultData userRegister(@RequestBody Map<String,Object> map) {
logger.info("UserBasicInfoController >>>>>>>>>>>> userRegister >>>>>>>>>>>>>"+map.toString()); logger.info("UserBasicInfoController >>>>>>>>>>>> userRegister >>>>>>>>>>>>>"+map.toString());
String phone = String.valueOf(map.get("phone")) ;
String nickName = String.valueOf(map.get("nickName"));
String sexStr = String.valueOf(map.get("sex"));
String avatarUrl = String.valueOf(map.get("avatarUrl"));
String phone = map.get("phone")==null?"":map.get("phone").toString();
String nickName = map.get("nickName")==null?"":map.get("nickName").toString();
String sexStr = map.get("sex")==null?"":map.get("sex").toString();
String avatarUrl = map.get("avatarUrl")==null?"":map.get("avatarUrl").toString();
if(StringUtils.isBlank(phone)){ if(StringUtils.isBlank(phone)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"手机号不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"手机号不能为空");
} }
@@ -84,10 +84,11 @@ public class UserBasicInfoController extends BaseController {
@ApiOperation(value = "会员", notes = "") @ApiOperation(value = "会员", notes = "")
public ResultData getUserInfo(@RequestBody Map<String,Object> map) { public ResultData getUserInfo(@RequestBody Map<String,Object> map) {
logger.info("UserBasicInfoController >>>>>>>>>>>> getUserInfo >>>>>>>>>>>>>"+map.toString()); logger.info("UserBasicInfoController >>>>>>>>>>>> getUserInfo >>>>>>>>>>>>>"+map.toString());
String phone = String.valueOf(map.get("phone"));
String openId = String.valueOf(map.get("openId"));
String phone = map.get("phone")==null?"":map.get("phone").toString();
String openId = map.get("openId")==null?"":map.get("openId").toString();
WxCUserBasicInfo basicInfo = null; WxCUserBasicInfo basicInfo = null;
if(StringUtils.isBlank(phone) && StringUtils.isBlank(openId)){
if(StringUtils.isBlank(phone)
&& StringUtils.isBlank(openId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
if(StringUtils.isNotBlank(phone)){ if(StringUtils.isNotBlank(phone)){


+ 43
- 28
mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java Просмотреть файл

@@ -46,14 +46,14 @@ public class UserThirdCircleOrderController extends BaseController {
public ResultData createOrder(@RequestBody Map<String,Object> map) { public ResultData createOrder(@RequestBody Map<String,Object> map) {
logger.info("UserThirdCircleOrderController >>>>>>>>>>>> createOrder >>>>>>>>>>>>>"+map.toString()); logger.info("UserThirdCircleOrderController >>>>>>>>>>>> createOrder >>>>>>>>>>>>>"+map.toString());


String transactionId = String.valueOf(map.get("transactionId"));//***订单Id
String shopNumber = String.valueOf(map.get("shopNumber"));//***门店唯一标识 对应双方平台门店
String shopName = String.valueOf(map.get("shopName"));//门店名称
String userNumber = String.valueOf(map.get("userNumber"));//***会员Id
String userPhone = String.valueOf(map.get("userPhone"));//会员手机号
String timeEnd = String.valueOf(map.get("timeEnd"));//***付款时间(yyyy-MM-dd HH:mm:ss)
String amount = String.valueOf(map.get("amount"));//***付款金额(分)
String summary = String.valueOf(map.get("summary"));//付款摘要
String transactionId = map.get("transactionId")==null?"":map.get("transactionId").toString();//***订单Id
String shopNumber = map.get("shopNumber")==null?"":map.get("shopNumber").toString();//***门店唯一标识 对应双方平台门店
String shopName = map.get("shopName")==null?"":map.get("shopName").toString();//门店名称
String userNumber = map.get("userNumber")==null?"":map.get("userNumber").toString();//***会员Id
String userPhone = map.get("userPhone")==null?"":map.get("userPhone").toString();//会员手机号
String timeEnd = map.get("timeEnd")==null?"":map.get("timeEnd").toString();//***付款时间(yyyy-MM-dd HH:mm:ss)
String amount = map.get("amount")==null?"":map.get("amount").toString();//***付款金额(分)
String summary = map.get("summary")==null?"":map.get("summary").toString();//付款摘要


if(StringUtils.isBlank(transactionId)){ if(StringUtils.isBlank(transactionId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空");
@@ -64,8 +64,10 @@ public class UserThirdCircleOrderController extends BaseController {
if(StringUtils.isBlank(userNumber)){ if(StringUtils.isBlank(userNumber)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空");
} }
if(StringUtils.isNotBlank(userPhone) && !userPhone.matches("^1[0-9]{10}$")){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"userPhone格式不正确");
if(StringUtils.isNotBlank(userPhone)){
if(!userPhone.matches("^1[0-9]{10}$")){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"userPhone格式不正确");
}
} }
if(StringUtils.isBlank(timeEnd)){ if(StringUtils.isBlank(timeEnd)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"timeEnd为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"timeEnd为空");
@@ -79,9 +81,16 @@ public class UserThirdCircleOrderController extends BaseController {
if(StringUtils.isBlank(amount)){ if(StringUtils.isBlank(amount)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空");
} }
if(!NumberUtils.isCreatable(amount) || Integer.parseInt(amount) <= 0){
if(!NumberUtils.isCreatable(amount)){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字");
} }
try {
if(Integer.parseInt(amount) <= 0){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为正整数");
}
} catch (NumberFormatException e) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为正整数");
}


WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders();
thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.updateTenantInfo(getTenantInfo());
@@ -120,11 +129,11 @@ public class UserThirdCircleOrderController extends BaseController {
public ResultData orderRefund(@RequestBody Map<String,Object> map) { public ResultData orderRefund(@RequestBody Map<String,Object> map) {
logger.info("UserThirdCircleOrderController >>>>>>>>>>>> orderRefund >>>>>>>>>>>>>"+map.toString()); logger.info("UserThirdCircleOrderController >>>>>>>>>>>> orderRefund >>>>>>>>>>>>>"+map.toString());


String transactionId = String.valueOf(map.get("transactionId"));//***订单Id
String refundTime = String.valueOf(map.get("refundTime"));//***退款时间(yyyy-MM-dd HH:mm:ss)
String refundSummary = String.valueOf(map.get("refundSummary"));//退款摘要
String refundAmount = String.valueOf(map.get("refundAmount"));//退款金额(分)
String refundId = String.valueOf(map.get("refundId"));//**退款Id
String transactionId = map.get("transactionId")==null?"":map.get("transactionId").toString();//***订单Id
String refundTime = map.get("refundTime")==null?"":map.get("refundTime").toString();//***退款时间(yyyy-MM-dd HH:mm:ss)
String refundSummary = map.get("refundSummary")==null?"":map.get("refundSummary").toString();//退款摘要
String refundAmount = map.get("refundAmount")==null?"":map.get("refundAmount").toString();//退款金额(分)
String refundId = map.get("refundId")==null?"":map.get("refundId").toString();//**退款Id


if(StringUtils.isBlank(transactionId)){ if(StringUtils.isBlank(transactionId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空");
@@ -136,7 +145,7 @@ public class UserThirdCircleOrderController extends BaseController {
try { try {
refundTimeDate = sdf.parse(refundTime); refundTimeDate = sdf.parse(refundTime);
} catch (ParseException e) { } catch (ParseException e) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"timeEnd格式不正确");
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"refundTime格式不正确");
} }
Integer refund = 0; Integer refund = 0;
if(StringUtils.isNotBlank(refundAmount)){ if(StringUtils.isNotBlank(refundAmount)){
@@ -194,14 +203,14 @@ public class UserThirdCircleOrderController extends BaseController {
public ResultData pointDeduction(@RequestBody Map<String,Object> map) { public ResultData pointDeduction(@RequestBody Map<String,Object> map) {
logger.info("UserThirdCircleOrderController >>>>>>>>>>>> pointDeduction >>>>>>>>>>>>>"+map.toString()); logger.info("UserThirdCircleOrderController >>>>>>>>>>>> pointDeduction >>>>>>>>>>>>>"+map.toString());


String transactionId = String.valueOf(map.get("transactionId"));//***订单Id
String shopNumber = String.valueOf(map.get("shopNumber"));//***门店唯一标识 对应双方平台门店
String shopName = String.valueOf(map.get("shopName"));//门店名称
String userNumber = String.valueOf(map.get("userNumber"));//***会员Id
String userPhone = String.valueOf(map.get("userPhone"));//会员手机号
String timeEnd = String.valueOf(map.get("timeEnd"));//***抵扣时间
String amount = String.valueOf(map.get("amount"));//***积分数量
String summary = String.valueOf(map.get("summary"));//摘要
String transactionId = map.get("transactionId")==null?"":map.get("transactionId").toString();//***订单Id
String shopNumber = map.get("shopNumber")==null?"":map.get("shopNumber").toString();//***门店唯一标识 对应双方平台门店
String shopName = map.get("shopName")==null?"":map.get("shopName").toString();//门店名称
String userNumber = map.get("userNumber")==null?"":map.get("userNumber").toString();//***会员Id
String userPhone = map.get("userPhone")==null?"":map.get("userPhone").toString();//会员手机号
String timeEnd = map.get("timeEnd")==null?"":map.get("timeEnd").toString();//***抵扣时间
String amount = map.get("amount")==null?"":map.get("amount").toString();//***积分数量
String summary = map.get("summary")==null?"":map.get("summary").toString();//付款摘要


if(StringUtils.isBlank(transactionId)){ if(StringUtils.isBlank(transactionId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空");
@@ -213,13 +222,12 @@ public class UserThirdCircleOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空");
} }
if(StringUtils.isNotBlank(userPhone)){ if(StringUtils.isNotBlank(userPhone)){
logger.info("phone+"+userPhone);
if(!userPhone.matches("^1[0-9]{10}$")){ if(!userPhone.matches("^1[0-9]{10}$")){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"userPhone格式不正确"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"userPhone格式不正确");
} }
} }


if(timeEnd == null){
if(StringUtils.isBlank(timeEnd)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"timeEnd为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"timeEnd为空");
} }
Date timeEndDate = null; Date timeEndDate = null;
@@ -231,9 +239,16 @@ public class UserThirdCircleOrderController extends BaseController {
if(StringUtils.isBlank(amount)){ if(StringUtils.isBlank(amount)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"amount为空");
} }
if(!NumberUtils.isCreatable(amount) || Integer.parseInt(amount) <= 0){
if(!NumberUtils.isCreatable(amount)){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为非数字");
} }
try {
if(Integer.parseInt(amount) <= 0){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为正整数");
}
} catch (NumberFormatException e) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"amount为正整数");
}


WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders(); WxThirdPartyOrders thirdPartyOrders = new WxThirdPartyOrders();
thirdPartyOrders.updateTenantInfo(getTenantInfo()); thirdPartyOrders.updateTenantInfo(getTenantInfo());


+ 1
- 1
mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java Просмотреть файл

@@ -73,7 +73,7 @@ public class AppTest {
paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id
paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店
paramMap.put("shopName","百丽");//门店名称 paramMap.put("shopName","百丽");//门店名称
paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728
paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728
// paramMap.put("userPhone","18872592633");//会员手机号 // paramMap.put("userPhone","18872592633");//会员手机号
paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间
paramMap.put("amount","100");//***付款金额(分) paramMap.put("amount","100");//***付款金额(分)


Загрузка…
Отмена
Сохранить