3c7d28f4 刘嘉

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

1 个父辈 ec023fdc
......@@ -4,6 +4,7 @@ import com.sibu.orderHelper.common.constants.AppConstants;
import com.sibu.orderHelper.common.database.DBContextHolder;
import com.sibu.orderHelper.common.strategy.DbUtil;
import com.sibu.orderHelper.common.util.StringUtil;
import com.sibu.orderHelper.enums.PayOrderStatus;
import com.sibu.orderHelper.enums.PineappleEnum;
import com.sibu.orderHelper.enums.PineappleMethodsEnum;
import com.sibu.orderHelper.integral.dao.PineappleDao;
......@@ -30,11 +31,8 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
BaseResponse baseResponse =new BaseResponse();
Map<String,Object> params = new HashMap<>();
String redisMysqlDbConfig = "";
//订单号不符合
if (StringUtil.isNull(DbUtil.getOrderInWhichTable(callRequest.getBizModel().getPlatOrderNo()))) {
log.error(String.format("订单号:%s不符合,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
throw new BizException(String.format("订单号:%s不符合,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
}
Integer dataBaseModule = DbUtil.getOrderInWhichDataBase(callRequest.getBizModel().getPlatOrderNo());
String tableIndex = DbUtil.getOrderInWhichTable(callRequest.getBizModel().getPlatOrderNo());
redisMysqlDbConfig = String.format(AppConstants.REDIS_DB_TYPE, AppConstants.INTEGRALMALL_ORDER_DATABASE, dataBaseModule.intValue());
......@@ -60,14 +58,10 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
if(!StringUtil.isNull(callRequest.getBizModel().getSenderAddress())){
String [] str = callRequest.getBizModel().getSenderAddress().split(" ");
if(!StringUtil.isNull(str) && str.length >3){
String province = str[0];
String city = str[1];
String area = str[2];
String address= str[3];
params.put("province",province);
params.put("city",city);
params.put("area",area);
params.put("address",province+"-"+city+"-"+area+"-"+address);
params.put("province",str[0]);
params.put("city", str[1]);
params.put("area",str[2]);
params.put("address",str[0]+"-"+str[1]+"-"+str[2]+"-"+str[3]);
}else{
log.error(String.format("订单号:%s,地址不符合要求:%s,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getBizModel().getSenderAddress(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
throw new BizException(String.format("订单号:%s,地址不符合要求:%s,请求method:%s,appket:%s",callRequest.getBizModel().getPlatOrderNo(),callRequest.getBizModel().getSenderAddress(),callRequest.getRequest().getMethod(),callRequest.getRequest().getAppkey()));
......