|
@@ -7,10 +7,12 @@ import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.GoodsWholesaleOrderDonMapper;
|
|
import com.cyksj.mapper.GoodsWholesaleOrderDonMapper;
|
|
|
import com.cyksj.mapper.GoodsWholesaleUserDepositMapper;
|
|
import com.cyksj.mapper.GoodsWholesaleUserDepositMapper;
|
|
|
|
|
+import com.cyksj.mapper.GoodsWholesaleUserReturnRecordMapper;
|
|
|
import com.cyksj.model.dto.AliPayParams;
|
|
import com.cyksj.model.dto.AliPayParams;
|
|
|
import com.cyksj.model.entity.GoodsWholesaleOrderDon;
|
|
import com.cyksj.model.entity.GoodsWholesaleOrderDon;
|
|
|
import com.cyksj.model.entity.GoodsWholesaleUserAccount;
|
|
import com.cyksj.model.entity.GoodsWholesaleUserAccount;
|
|
|
import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
|
|
import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
|
|
|
|
|
+import com.cyksj.model.entity.GoodsWholesaleUserReturnRecord;
|
|
|
import com.cyksj.model.request.AlipayOrderDonReq;
|
|
import com.cyksj.model.request.AlipayOrderDonReq;
|
|
|
import com.cyksj.model.request.GoodsWholesaleOrderPayReq;
|
|
import com.cyksj.model.request.GoodsWholesaleOrderPayReq;
|
|
|
import com.cyksj.model.response.AliPayTradeStatus;
|
|
import com.cyksj.model.response.AliPayTradeStatus;
|
|
@@ -63,6 +65,8 @@ public class GoodsWholesaleWebController {
|
|
|
|
|
|
|
|
private final GoodsWholesaleOrderDonMapper goodsWholesaleOrderDonMapper;
|
|
private final GoodsWholesaleOrderDonMapper goodsWholesaleOrderDonMapper;
|
|
|
|
|
|
|
|
|
|
+ private final GoodsWholesaleUserReturnRecordMapper returnRecordMapper;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 平台批发列表
|
|
* 平台批发列表
|
|
|
*/
|
|
*/
|
|
@@ -226,6 +230,20 @@ public class GoodsWholesaleWebController {
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 是否已返差价
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("/return/differ")
|
|
|
|
|
+ public Result<Boolean> returnDiffer(@RequestParam(required = true) Long orderId) {
|
|
|
|
|
+ long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
|
|
+ List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
|
|
|
|
|
+ GoodsWholesaleOrderDon orderDon = orderDonMapper.selectById(orderId);
|
|
|
|
|
+ Integer selectCount = returnRecordMapper.selectCount(Wrappers.lambdaQuery(GoodsWholesaleUserReturnRecord.class)
|
|
|
|
|
+ .in(GoodsWholesaleUserReturnRecord::getUserId, userIdList)
|
|
|
|
|
+ .eq(GoodsWholesaleUserReturnRecord::getSkuId, orderDon.getSkuId()));
|
|
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult(selectCount > 0);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 获取支付宝回调参数
|
|
* 获取支付宝回调参数
|