Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/ldt

src/main/java/org/springblade/gateway/goods_gatway/service/impl/AppGoodsBillsServiceImpl.java

@@ -99,11 +99,11 @@ public class AppGoodsBillsServiceImpl extends BaseServiceImpl<GoodsBillsMapper,
 		//取手机号作为取餐号
 		String verifyNum = StringUtil.sub(appGoodsBillsDTO.getUserPhone(), 7, 11);
 		appGoodsBillsDTO.setVerifyNum(Integer.valueOf(verifyNum));
-		appGoodsBillsDTO.setOrderStatus(AppConstant.BillPayStatus.待付款.name());
+		appGoodsBillsDTO.setOrderStatus(successParams.getStatus());
 		this.save(appGoodsBillsDTO);
 		Map resMap = new HashMap(2);
 		resMap.put("successParams", successParams);
-		resMap.put("verifyNum", verifyNum);
+		resMap.put("goodsBills", appGoodsBillsDTO);
 		return resMap;
 	}
 }

src/main/java/org/springblade/payment/callback/trade/UserPayCallback.java

@@ -123,11 +123,6 @@ public class UserPayCallback {
 				throw new ServiceException(ResCode.USER_PAY_CALLBACK_ERROR);
 			});
 
-			//更新商品订单
-			Assert.isTrue(handelGoodsBills(bills), () -> {
-				throw new ServiceException(ResCode.GOODS_BILLS_ERROR);
-			});
-
 			//通知处理 赠送用户积分 代理费等
 			applicationEventPublisher.publishEvent(new BillSuccessEvent(successParams));
 
@@ -151,21 +146,6 @@ public class UserPayCallback {
 		}
 	}
 
-	/**
-	 * 修改商品订单
-	 * @param bills
-	 * @return
-	 */
-	private boolean handelGoodsBills(Bills bills){
-		GoodsBills goodsBills = goodsBillsService.getOne(Condition.getQueryWrapper(new GoodsBills()).lambda().eq(GoodsBills::getBillsId, bills.getId()));
-		if (goodsBills != null) {
-			goodsBills.setOrderStatus(AppConstant.BillPayStatus.付款成功.name());
-			goodsBills.setFinishTime(bills.getCreateTime());
-			return goodsBillsService.updateById(goodsBills);
-		}
-		return true;
-	}
-
 	/**
 	 * 修改用户积分以及积分账单状态
 	 */