Merge remote-tracking branch 'origin/dev' into dev

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/biz/OrderPayBiz.java

@@ -128,7 +128,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 			jsParam = WXPay.getH5PayParam(amount + "", orderPayVo.getBuyerIp(), trade_no, orderPayVo.getBody(), orderPayVo.getBody(), orderPayVo.getBody(), notify_url);
 		} else if (payWay == 3) { //对公账户支付
 			sellerAccount = SystemConfig.APP_PARTNER;
-			//生成随机码
 
 		}
 		log.info("报名费回调路径jsParam:" + jsParam);

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.ClientUtil;
 import com.github.wxiaoqi.security.common.util.OrderUtil;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.UUIDUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -126,6 +127,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 			orderInfo.setOrderNo(OrderUtil.GetOrderNumber("", OrderUtil.APP_MID));
 			old = getOneByOrderNo(orderInfo.getOrderNo());
 		}
+		orderInfo.setPayCode(UUIDUtils.genCodes(0));
 		return addUpdate(orderInfo);
 	}
 
@@ -166,8 +168,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getKeywords())) {
 			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getKeywords() + "%")
 					.orLike("realName", "%" + userOrderDto.getKeywords() + "%")
-					.orLike("phone", "%" +userOrderDto.getKeywords()+ "%")
-					.orLike("orderNo", "%" +userOrderDto.getKeywords()+ "%");
+					.orLike("phone", "%" + userOrderDto.getKeywords() + "%")
+					.orLike("orderNo", "%" + userOrderDto.getKeywords() + "%");
 		}
 		orderInfoCriteria.andNotEqualTo("status", -1);
 		example.orderBy("updTime").desc();
@@ -657,8 +659,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getKeywords())) {
 			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getKeywords() + "%")
 					.orLike("realName", "%" + userOrderDto.getKeywords() + "%")
-					.orLike("phone", "%" +userOrderDto.getKeywords()+ "%")
-					.orLike("orderNo", "%" +userOrderDto.getKeywords()+ "%");
+					.orLike("phone", "%" + userOrderDto.getKeywords() + "%")
+					.orLike("orderNo", "%" + userOrderDto.getKeywords() + "%");
 		}
 		example.orderBy("updTime").desc();
 		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
@@ -825,7 +827,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 				orderItemBiz.insertSelective(orderItem);
 			}
 		});
-		CustomForm customForm = customFormBiz.selectOne(new CustomForm(){{setOrderId(orderInfo.getOrderId().intValue());}});
+		CustomForm customForm = customFormBiz.selectOne(new CustomForm() {{
+			setOrderId(orderInfo.getOrderId().intValue());
+		}});
 		if (customForm != null) {
 			customForm.setStatus(2);
 			customFormBiz.updateSelectiveByIdRe(customForm);
@@ -835,6 +839,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 
 	/**
 	 * 定制订单 添加发票和地址信息
+	 *
 	 * @param orderInfoDto
 	 * @return
 	 */
@@ -885,6 +890,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 
 	/**
 	 * 根据类型查询商品信息
+	 *
 	 * @param type
 	 * @param name
 	 * @return
@@ -930,7 +936,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 					});
 				}
 			case STANDARD_DATA:
-				PageDataVO<ImageDataVO> pageDataVO = datacenterFeign.pageBykey(new ImagePageFeginDTO(){{setKeyword(name);}}).getData();
+				PageDataVO<ImageDataVO> pageDataVO = datacenterFeign.pageBykey(new ImagePageFeginDTO() {{
+					setKeyword(name);
+				}}).getData();
 				if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) {
 					pageDataVO.getData().parallelStream().forEach(imageDataVO -> {
 						ItemInfoVo itemInfoVo = new ItemInfoVo();
@@ -947,6 +955,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 
 	/**
 	 * 订单支付
+	 *
 	 * @param orderPayVo
 	 * @return
 	 */
@@ -968,6 +977,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 
 	/**
 	 * 支付成功修改订单状态
+	 *
 	 * @param orderInfo
 	 * @return
 	 */
@@ -986,7 +996,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	}
 
 	/**
-	 * 	对公账号支付设置
+	 * 对公账号支付设置
+	 *
 	 * @param orderInfo
 	 * @return
 	 */
@@ -998,18 +1009,15 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (old == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
 		}
-		if (old.getPayCode().equals(orderInfo.getPayCode())) {
-			old.setPayImg(orderInfo.getPayImg());
-			old.setPayTime(new Date());
-			updateSelectiveByIdRe(old);
-			return ObjectRestResponse.succ();
-		} else {
-			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "汇款识别码错误");
-		}
+		old.setPayImg(orderInfo.getPayImg());
+		old.setPayTime(new Date());
+		updateSelectiveByIdRe(old);
+		return ObjectRestResponse.succ();
 	}
 
 	/**
 	 * 后台确认对公支付成功
+	 *
 	 * @param orderInfo
 	 * @return
 	 */
@@ -1025,7 +1033,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		old.setPayStatus(2);
 		old.setPayTime(new Date());
 		updateSelectiveByIdRe(old);
-		return thirdFeign.updateStatus(new OrderPay(){{old.getOrderNo();}});
+		return thirdFeign.updateStatus(new OrderPay() {{
+			old.getOrderNo();
+		}});
 	}
 
 }
\ No newline at end of file