Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/dto/clerk/OrderAddClerkDTO.java

+package com.gic.store.dto.clerk;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-15 11:08
+ */
+public class OrderAddClerkDTO implements Serializable {
+
+    private static final long serialVersionUID = -8396198930481002753L;
+    private String clerkName;
+    private String clerkCode;
+    private Integer storeInfoId;
+    private Integer enterpriseId;
+    private String orderNum;
+    private Date orderTime;
+
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    public Date getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(Date orderTime) {
+        this.orderTime = orderTime;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/clerk/PosAddClerkDTO.java

+package com.gic.store.dto.clerk;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-15 11:10
+ */
+public class PosAddClerkDTO implements Serializable {
+
+
+    private static final long serialVersionUID = -3783721136741569586L;
+
+    private String clerkName;
+    private String clerkCode;
+    private Integer storeInfoId;
+    private Integer enterpriseId;
+    private String cardNO;
+    private Date openCardTime;
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public void setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getCardNO() {
+        return cardNO;
+    }
+
+    public void setCardNO(String cardNO) {
+        this.cardNO = cardNO;
+    }
+
+    public Date getOpenCardTime() {
+        return openCardTime;
+    }
+
+    public void setOpenCardTime(Date openCardTime) {
+        this.openCardTime = openCardTime;
+    }
+}

gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java

@@ -5,6 +5,8 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.store.dto.ClerkDTO;
 import com.gic.store.dto.ClerkSearchDTO;
 import com.gic.store.dto.ClerkStoreListDTO;
+import com.gic.store.dto.clerk.OrderAddClerkDTO;
+import com.gic.store.dto.clerk.PosAddClerkDTO;
 import com.gic.store.dto.clerk.ProcessBatchClerkDTO;
 
 import java.util.List;
@@ -42,8 +44,10 @@ public interface ClerkApiService {
      * @return
      */
     ServiceResponse<Integer> saveClerkForPosMember(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String cardNO);
+    ServiceResponse<Integer> saveClerkForPosMember(PosAddClerkDTO posAddClerkDTO);
 
     ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String orderNum);
+    ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(OrderAddClerkDTO orderAddClerkDTO);
 
     
     /** @Description: 通过导购code查询导购

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -14,6 +14,8 @@ import com.gic.store.constant.ImportClerkBatchResultEnum;
 import com.gic.store.constant.StoreLogTypeEnum;
 import com.gic.store.constant.StoreOwnTypeEnum;
 import com.gic.store.dto.*;
+import com.gic.store.dto.clerk.OrderAddClerkDTO;
+import com.gic.store.dto.clerk.PosAddClerkDTO;
 import com.gic.store.dto.clerk.ProcessBatchClerkDTO;
 import com.gic.store.entity.TabClerk;
 import com.gic.store.entity.TabStoreGroup;
@@ -158,6 +160,30 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     }
 
     @Override
+    public ServiceResponse<Integer> saveClerkForPosMember(PosAddClerkDTO posAddClerkDTO) {
+        ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(posAddClerkDTO.getEnterpriseId(), posAddClerkDTO.getStoreInfoId());
+        if (storeResponse.getResult() != null) {
+            StoreDTO store = storeResponse.getResult();
+            ClerkDTO clerkDTO = new ClerkDTO();
+            clerkDTO.setClerkName(posAddClerkDTO.getClerkName());
+            clerkDTO.setClerkCode(posAddClerkDTO.getClerkCode());
+            clerkDTO.setEnterpriseId(posAddClerkDTO.getEnterpriseId());
+            clerkDTO.setStoreInfoId(store.getStoreInfoId());
+            clerkDTO.setReason(ClerkLogReasonEnum.MEMBER.getCode());
+            clerkDTO.setRemark("卡号:" + posAddClerkDTO.getCardNO());
+            clerkDTO.setStoreName(store.getStoreName());
+
+            clerkDTO.setStatus((posAddClerkDTO.getOpenCardTime().getTime() + 15552000000L) > new Date().getTime() ? 1 : 0);
+
+            ServiceResponse serviceResponse = this.saveOrUpdate(clerkDTO);
+            return serviceResponse;
+        } else {
+            logger.warn("门店不存在 enterpriseId:{}, storeInfoId:{}", posAddClerkDTO.getEnterpriseId(), posAddClerkDTO.getStoreInfoId());
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
+        }
+    }
+
+    @Override
     public ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String orderNum) {
 //        Integer storeId = this.storeService.getStoreIdByStoreInfoId(enterpriseId, storeInfoId);
 //        if (storeId != null) {
@@ -168,6 +194,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             clerkDTO.setStoreInfoId(storeInfoId);
             clerkDTO.setReason(ClerkLogReasonEnum.ORDER.getCode());
             clerkDTO.setRemark("订单号:" + orderNum);
+
             ServiceResponse serviceResponse = this.saveOrUpdate(clerkDTO);
             return serviceResponse;
 //        } else {
@@ -177,6 +204,21 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     }
 
     @Override
+    public ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(OrderAddClerkDTO orderAddClerkDTO) {
+        ClerkDTO clerkDTO = new ClerkDTO();
+        clerkDTO.setClerkName(orderAddClerkDTO.getClerkName());
+        clerkDTO.setClerkCode(orderAddClerkDTO.getClerkCode());
+        clerkDTO.setEnterpriseId(orderAddClerkDTO.getEnterpriseId());
+        clerkDTO.setStoreInfoId(orderAddClerkDTO.getStoreInfoId());
+        clerkDTO.setReason(ClerkLogReasonEnum.ORDER.getCode());
+        clerkDTO.setRemark("订单号:" + orderAddClerkDTO.getOrderNum());
+        clerkDTO.setStatus((orderAddClerkDTO.getOrderTime().getTime() + 15552000000L) > new Date().getTime() ? 1 : 0);
+
+        ServiceResponse serviceResponse = this.saveOrUpdate(clerkDTO);
+        return serviceResponse;
+    }
+
+    @Override
     public ServiceResponse<ClerkDTO> getClerkByCode(Integer enterpriseId, String clerkCode, Integer storeId) {
         ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(enterpriseId, storeId);
         if (storeResponse.getResult() != null) {

gic-store-service/src/main/resources/mapper/TabClerkMapper.xml

@@ -314,6 +314,7 @@
     select
     <include refid="Base_Column_List" />
     from tab_clerk
+    <where>
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
@@ -323,6 +324,7 @@
         #{item}
       </foreach>
     </if>
+    </where>
   </select>
   <select id="getClerkByCode" resultMap="BaseResultMap">
     select

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -279,6 +279,12 @@ public class ClerkController extends DownloadUtils {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @RequestMapping("/list-clerk-in-store")
+    public RestResponse listClerkInStore(Integer storeId, String search) {
+        ServiceResponse<List<ClerkDTO>> serviceResponse = clerkApiService.listClerkByStoreId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId, search);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
     @RequestMapping("/list-clerk-log")
     public RestResponse listClerkLog(PageQO pageQO, String content, Integer reason, Integer logType, Integer clerkId) {
         ClerkLogDTO clerkLogDTO = new ClerkLogDTO();

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -307,7 +307,7 @@ public class StoreController extends DownloadUtils {
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
             storeSearchDTO.setEnterpriseId(enterpriseId);
             storeSearchDTO.setStoreIds(Joiner.on(" ").join(storeArr));
-            Page<StoreDTO> page = this.storeApiService.listStore(storeSearchDTO, 1, 3).getResult();
+            Page<StoreDTO> page = this.storeApiService.listStore(storeSearchDTO, 1, 3, "storeName").getResult();
             if (page != null && CollectionUtils.isNotEmpty(page.getResult())) {
                 List<StoreDTO> storeList = page.getResult();
                 if (CollectionUtils.isNotEmpty(storeList)) {