~API;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinStoreAdminController.java

@@ -51,6 +51,8 @@ public class GoblinStoreAdminController extends BaseController {
         if (StringUtils.isNotBlank(storeInfo.getCertType())) {
             lambdaQueryWrapper.eq(GoblinStoreInfo::getCertType, storeInfo.getCertType());
         }
+        lambdaQueryWrapper.eq(GoblinStoreInfo::getDelFlg, "0");
+        lambdaQueryWrapper.notIn(GoblinStoreInfo::getStatus, "0");
 
         lambdaQueryWrapper.select(
                 GoblinStoreInfo::getStoreId,
@@ -122,7 +124,7 @@ public class GoblinStoreAdminController extends BaseController {
     @ResponseBody
     public AjaxResult audit(String storeId) {
         try {
-            return this.toAjax(goblinStoreInfoService.audit(storeId, String.valueOf(3), ShiroUtils.getLoginName()));
+            return this.toAjax(goblinStoreInfoService.audit(storeId, String.valueOf(3), ShiroUtils.getLoginName(), null));
         } catch (Exception e) {
             return toAjax(false);
         }
@@ -138,7 +140,7 @@ public class GoblinStoreAdminController extends BaseController {
     @ResponseBody
     public AjaxResult reject(String storeId, String reason) {
         try {
-            return this.toAjax(goblinStoreInfoService.audit(storeId, String.valueOf(2), ShiroUtils.getLoginName()));
+            return this.toAjax(goblinStoreInfoService.audit(storeId, String.valueOf(2), ShiroUtils.getLoginName(), reason));
         } catch (Exception e) {
             return toAjax(false);
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/store/store.html

@@ -81,7 +81,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        if (row.status == '1') {
+                        if (row.status == 1) {
                             actions.push('<a class="btn btn-primary btn-xs ' + acceptFlg + '" href="javascript:void(0)" onclick="auditAccept(\'' + row.storeId + '\')"><i class="fa fa-check"></i>通过</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + rejectFlg + '" href="javascript:void(0)" onclick="auditReject(\'' + row.storeId + '\')"><i class="fa fa-close"></i>驳回</a> ');
                         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinStoreInfoService.java

@@ -18,7 +18,8 @@ public interface IGoblinStoreInfoService extends IService<GoblinStoreInfo> {
      * @param storeId  店铺ID
      * @param status   店铺状态
      * @param operator 操作人
+     * @param reason   拒绝原因
      * @return boolean
      */
-    boolean audit(String storeId, String status, String operator);
+    boolean audit(String storeId, String status, String operator, String reason);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinStoreInfoServiceImpl.java

@@ -36,19 +36,21 @@ public class GoblinStoreInfoServiceImpl extends ServiceImpl<GoblinStoreInfoMappe
 
     @Override
     @Transactional
-    public boolean audit(String storeId, String status, String operator) {
+    public boolean audit(String storeId, String status, String operator, String reason) {
         LocalDateTime now = LocalDateTime.now();
         LambdaUpdateWrapper<GoblinStoreInfo> lambdaUpdateWrapper = Wrappers.lambdaUpdate(GoblinStoreInfo.class);
         lambdaUpdateWrapper.eq(GoblinStoreInfo::getStoreId, storeId);
         lambdaUpdateWrapper.eq(GoblinStoreInfo::getStatus, 1);
 
         lambdaUpdateWrapper.set(GoblinStoreInfo::getStatus, status);
+        lambdaUpdateWrapper.set(GoblinStoreInfo::getReason, reason);
         lambdaUpdateWrapper.set(GoblinStoreInfo::getUpdatedBy, operator);
         lambdaUpdateWrapper.set(GoblinStoreInfo::getUpdatedAt, now);
 
         if (this.update(lambdaUpdateWrapper)) {
             Query query = Query.query(Criteria.where("storeId").is(storeId));
             Update update = Update.update("status", status);
+            update.set("reason", reason);
             update.set("updatedBy", operator);
             update.set("updatedAt", now);
             UpdateResult updateResult = mongoTemplate.updateFirst(query, update, GoblinStoreInfoVo.class.getSimpleName());