浏览代码

修改达人部分细节

ldz 1 月之前
父节点
当前提交
893c9cbcea

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeUserExpertController.java

@@ -202,9 +202,9 @@ public class LifeUserExpertController {
             @ApiImplicitParam(name = "userId", value = "用户id", dataType = "String", paramType = "query")
     })
     @GetMapping("/getFinalPaymentList")
-    public R<IPage<LifeUserExpertOrderVo>> getFinalPaymentList( Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId) {
+    public R<IPage<LifeUserExpertOrderVo>> getFinalPaymentList( Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId ,String orderNo) {
         log.info("LifeUserExpertController.getViewDetails?userId={}",userId);
-        return R.data(lifeUserExpertService.getFinalPaymentList(page, size, realName, userPhone, advancePaymentStatus, orderCreatedTime, orderEndTime, firstPayTime, endPayTime,firstCompleteTime,endCompleteTime,createdEndPaymentTime,endEndPaymentTime,name, userId));
+        return R.data(lifeUserExpertService.getFinalPaymentList(page, size, realName, userPhone, advancePaymentStatus, orderCreatedTime, orderEndTime, firstPayTime, endPayTime,firstCompleteTime,endCompleteTime,createdEndPaymentTime,endEndPaymentTime,name, userId,orderNo));
     }
 
     @ApiOperation("达人尾款审核接口")

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserExpertService.java

@@ -53,7 +53,7 @@ public interface LifeUserExpertService extends IService<LifeUserExpert> {
 
     Map<String,String> getAdvancePaymentReview(Integer id, String reasonRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String advancePaymentStatus,BigDecimal commissionMoney, BigDecimal advance);
 
-    IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId);
+    IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId ,String orderNo);
 
     Map<String,String> getFinalPaymentReview(Integer id, String endPaymentRefusal, String userPhone, String name, String storeTel, String orderNo, String orderMoney, String endFundsButton ,BigDecimal endPayment);
 

+ 2 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeUserExpertServiceImpl.java

@@ -525,7 +525,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
     }
 
     @Override
-    public IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId) {
+    public IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId ,String orderNo) {
         QueryWrapper<LifeUserExpertVo> wrapper = new QueryWrapper<>();
         wrapper.eq("ccc.delete_flag", 0);
         wrapper.eq("user.delete_flag", 0);
@@ -534,6 +534,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
         wrapper.eq("package.delete_flag",0);
         wrapper.like(StringUtils.isNotEmpty(realName), "user.real_name", realName);
         wrapper.like(StringUtils.isNotEmpty(userPhone), "user.user_phone", userPhone);
+        wrapper.like(StringUtils.isNotEmpty(orderNo), "ccc.order_no", orderNo);
         if (advancePaymentStatus != null && !advancePaymentStatus.isEmpty()){
             wrapper.eq("ccc.advance_payment_status", advancePaymentStatus);
         }