Skip to content

sibu-v-mall / sibu-v-mall-third-api

转到一个项目
切换导航栏
切换导航栏固定状态
3c7d28f4 由 刘嘉
选项

菠萝派接口-发货代码逻辑更改

1 个父辈 ec023fdc
内嵌 并排
正在显示 1 个修改的文件 包含 7 行增加 和 13 行删除
...@@ -4,6 +4,7 @@ import com.sibu.orderHelper.common.constants.AppConstants; ...@@ -4,6 +4,7 @@ import com.sibu.orderHelper.common.constants.AppConstants;
4 import com.sibu.orderHelper.common.database.DBContextHolder; 4 import com.sibu.orderHelper.common.database.DBContextHolder;
5 import com.sibu.orderHelper.common.strategy.DbUtil; 5 import com.sibu.orderHelper.common.strategy.DbUtil;
6 import com.sibu.orderHelper.common.util.StringUtil; 6 import com.sibu.orderHelper.common.util.StringUtil;
7 import com.sibu.orderHelper.enums.PayOrderStatus;
7 import com.sibu.orderHelper.enums.PineappleEnum; 8 import com.sibu.orderHelper.enums.PineappleEnum;
8 import com.sibu.orderHelper.enums.PineappleMethodsEnum; 9 import com.sibu.orderHelper.enums.PineappleMethodsEnum;
9 import com.sibu.orderHelper.integral.dao.PineappleDao; 10 import com.sibu.orderHelper.integral.dao.PineappleDao;
...@@ -30,11 +31,8 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen ...@@ -30,11 +31,8 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
30 BaseResponse baseResponse =new BaseResponse(); 31 BaseResponse baseResponse =new BaseResponse();
31 Map<String,Object> params = new HashMap<>(); 32 Map<String,Object> params = new HashMap<>();
32 String redisMysqlDbConfig = ""; 33 String redisMysqlDbConfig = "";
33 //订单号不符合 34
34 if (StringUtil.isNull(DbUtil.getOrderInWhichTable(callRequest.getBizModel().getPlatOrderNo()))) { 35
35 log.error(String.format("订单号：%s不符合,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
36 throw new BizException(String.format("订单号：%s不符合,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
37 }
38 Integer dataBaseModule = DbUtil.getOrderInWhichDataBase(callRequest.getBizModel().getPlatOrderNo()); 36 Integer dataBaseModule = DbUtil.getOrderInWhichDataBase(callRequest.getBizModel().getPlatOrderNo());
39 String tableIndex = DbUtil.getOrderInWhichTable(callRequest.getBizModel().getPlatOrderNo()); 37 String tableIndex = DbUtil.getOrderInWhichTable(callRequest.getBizModel().getPlatOrderNo());
40 redisMysqlDbConfig = String.format(AppConstants.REDIS_DB_TYPE, AppConstants.INTEGRALMALL_ORDER_DATABASE, dataBaseModule.intValue()); 38 redisMysqlDbConfig = String.format(AppConstants.REDIS_DB_TYPE, AppConstants.INTEGRALMALL_ORDER_DATABASE, dataBaseModule.intValue());
...@@ -60,14 +58,10 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen ...@@ -60,14 +58,10 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
60 if(!StringUtil.isNull(callRequest.getBizModel().getSenderAddress())){ 58 if(!StringUtil.isNull(callRequest.getBizModel().getSenderAddress())){
61 String [] str = callRequest.getBizModel().getSenderAddress().split(" "); 59 String [] str = callRequest.getBizModel().getSenderAddress().split(" ");
62 if(!StringUtil.isNull(str) && str.length >3){ 60 if(!StringUtil.isNull(str) && str.length >3){
63 String province = str[0]; 61 params.put("province",str[0]);
64 String city = str[1]; 62 params.put("city", str[1]);
65 String area = str[2]; 63 params.put("area",str[2]);
66 String address= str[3]; 64 params.put("address",str[0]+"-"+str[1]+"-"+str[2]+"-"+str[3]);
67 params.put("province",province);
68 params.put("city",city);
69 params.put("area",area);
70 params.put("address",province+"-"+city+"-"+area+"-"+address);
71 }else{ 65 }else{
72 log.error(String.format("订单号：%s,地址不符合要求:%s,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getBizModel().getSenderAddress(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey())); 66 log.error(String.format("订单号：%s,地址不符合要求:%s,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getBizModel().getSenderAddress(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
73 throw new BizException(String.format("订单号：%s,地址不符合要求:%s,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getBizModel().getSenderAddress(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey())); 67 throw new BizException(String.format("订单号：%s,地址不符合要求:%s,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getBizModel().getSenderAddress(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
......