Prechádzať zdrojové kódy

平台兜底,付款修改状态v03

简德馨 2 rokov pred
rodič
commit
c42ef8b318

+ 3 - 2
src/main/java/org/springblade/modules/api/controller/Api05Controller.java

@@ -207,8 +207,8 @@ public class Api05Controller extends BladeController {
 			List<Consign> consigns = consignService.listByIds(payRequest.getConsignId());
 			for (Consign consign : consigns) {
 				if(consign.getConsignState() == 2){
-					UserApp userApp = userAppMapper.selectById(consign.getConsignUserId());
-					iTradeService.transfer(userApp, consign.getConsignPrice().toString(), consign.getConsignConfigId());
+					UserApp userApp = userAppMapper.selectOne(Wrappers.lambdaQuery(UserApp.class).eq(UserApp::getUserId,consign.getConsignUserId()));
+					iTradeService.transfer(userApp, consign.getConsignPrice().toString(), consign.getConsignConfigId(),consign);
 				}
 			}
 			return R.success("确认付款成功");
@@ -227,6 +227,7 @@ public class Api05Controller extends BladeController {
 		LambdaQueryWrapper<Consign> query = Wrappers.lambdaQuery(Consign.class);
 		query.eq(Consign::getConsignConfigId,consignConfigId);
 		query.eq(Consign::getConsignState, 2);
+		query.eq(Consign::getNowStock, 0);
 		List<Consign> list = consignService.list(query);
 		return R.data(list);
 	}

+ 1 - 1
src/main/java/org/springblade/modules/api/service/ITradeService.java

@@ -47,7 +47,7 @@ public interface ITradeService {
 	 * @param transAmount 金额
 	 * @param orderConsignId 寄售(进货)Id
 	 */
-	void transfer(UserApp user, String transAmount, Long orderConsignId);
+	void transfer(UserApp user, String transAmount, Long orderConsignId, Consign consign);
 
 	/**
 	 * 寄售用户

+ 3 - 1
src/main/java/org/springblade/modules/api/service/impl/TradeServiceImpl.java

@@ -182,7 +182,7 @@ public class TradeServiceImpl implements ITradeService {
 	 * @param orderConsignId 寄售(进货)Id
 	 */
 	@Override
-	public void transfer(UserApp user, String transAmount, Long orderConsignId){
+	public void transfer(UserApp user, String transAmount, Long orderConsignId, Consign consign){
 		OrderConsign orderConsign = new OrderConsign();
 		orderConsign.setId(orderConsignId);
 		orderConsign.setConfirmTime(DateUtil.now());
@@ -258,6 +258,8 @@ public class TradeServiceImpl implements ITradeService {
 				orderConsign.setBody("向用户【" + name +" 】打款成功,打款账号:"  + identity);
 				orderConsign.setIsConfirm(2);//确认
 			}
+			consign.setConsignState(3);
+			consignService.updateById(consign);
 			orderConsignService.updateById(orderConsign);
 		} catch (AlipayApiException e) {
 			e.printStackTrace();