fixed 员工佣金明细

fuint-application/src/main/java/com/fuint/common/service/impl/CommissionCashServiceImpl.java

@@ -171,7 +171,7 @@ public class CommissionCashServiceImpl extends ServiceImpl<MtCommissionCashMappe
                 lambdaQueryWrapper.eq(MtCommissionLog::getStaffId, staffList.get(0).getId());
             }
         }
-        String mobile =commissionSettleRequest.getMobile();
+        String mobile = commissionSettleRequest.getMobile();
         if (StringUtils.isNotBlank(mobile)) {
             MtStaff mtStaff = staffService.queryStaffByMobile(mobile);
             if (mtStaff != null) {

fuint-application/src/main/java/com/fuint/common/service/impl/CommissionLogServiceImpl.java

@@ -106,6 +106,10 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
                 lambdaQueryWrapper.eq(MtCommissionLog::getStaffId, -1);
             }
         }
+        String uuid = paginationRequest.getSearchParams().get("uuid") == null ? "" : paginationRequest.getSearchParams().get("uuid").toString();
+        if (StringUtils.isNotBlank(uuid)) {
+            lambdaQueryWrapper.eq(MtCommissionLog::getSettleUuid, uuid);
+        }
         String status = paginationRequest.getSearchParams().get("status") == null ? "" : paginationRequest.getSearchParams().get("status").toString();
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtCommissionLog::getStatus, status);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionLogController.java

@@ -77,6 +77,7 @@ public class BackendCommissionLogController extends BaseController {
         String searchStoreId = request.getParameter("storeId");
         String realName = request.getParameter("realName");
         String mobile = request.getParameter("mobile");
+        String uuid = request.getParameter("uuid");
         String startTime = request.getParameter("startTime") == null ? "" : request.getParameter("startTime");
         String endTime = request.getParameter("endTime") == null ? "" : request.getParameter("endTime");
 
@@ -120,6 +121,9 @@ public class BackendCommissionLogController extends BaseController {
         if (StringUtil.isNotEmpty(mobile)) {
             params.put("mobile", mobile);
         }
+        if (StringUtil.isNotEmpty(uuid)) {
+            params.put("uuid", uuid);
+        }
         paginationRequest.setSearchParams(params);
         PaginationResponse<CommissionLogDto> paginationResponse = commissionLogService.queryCommissionLogByPagination(paginationRequest);
 
@@ -254,7 +258,9 @@ public class BackendCommissionLogController extends BaseController {
         }
 
         commissionSettleRequest.setOperator(accountDto.getAccountName());
-        commissionSettleRequest.setMerchantId(accountDto.getMerchantId());
+        if (accountDto.getMerchantId() != null && accountDto.getMerchantId() > 0) {
+            commissionSettleRequest.setMerchantId(accountDto.getMerchantId());
+        }
         if (accountDto.getStoreId() != null && accountDto.getStoreId() > 0) {
             commissionSettleRequest.setStoreId(accountDto.getStoreId());
         }

fuint-application/src/main/java/com/fuint/module/backendApi/request/CommissionSettleRequest.java

@@ -19,7 +19,7 @@ public class CommissionSettleRequest implements Serializable {
     @ApiModelProperty(value="店铺ID", name="storeId")
     private Integer storeId;
 
-    @ApiModelProperty(value="员工姓名", name="name")
+    @ApiModelProperty(value="员工姓名", name="realName")
     private String realName;
 
     @ApiModelProperty(value="员工手机号", name="mobile")