店内执行六小金刚、三米两秒修改数据接口

src/main/java/com/sfa/operation/controller/sales/core/ApDisplayCoreController.java

@@ -54,6 +54,26 @@ public class ApDisplayCoreController {
         apDisplayCoreService.putSnackDisplayDetail(request);
     }
 
+    /**
+     * 三米两秒
+     */
+    @PutMapping("/core_s/{id}")
+    public void putDisplaySDetail(@PathVariable("id") Long sadsId, @RequestBody SalesApRequest request){
+        checkPermission();
+        request.setSadsId(sadsId);
+        apDisplayCoreService.putDisplaySDetail(request);
+    }
+
+    /**
+     * 六小金刚
+     */
+    @PutMapping("/core_j/{id}")
+    public void putDisplayJDetail(@PathVariable("id") Long sadjId, @RequestBody SalesApRequest request){
+        checkPermission();
+        request.setSadjId(sadjId);
+        apDisplayCoreService.putDisplayJDetail(request);
+    }
+
     private void checkPermission(){
         // 是区域销售部的人员，查看人客关系
         LoginUser loginUser = SecurityUtils.getLoginUser();

src/main/java/com/sfa/operation/domain/sales/dao/ISalesApDisplayJDao.java

@@ -2,6 +2,7 @@ package com.sfa.operation.domain.sales.dao;
 
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.operation.domain.sales.wq.SalesApWq;
+import com.sfa.operation.pojo.sales.response.SalesApDisplayJDto;
 
 /**
  * @author : liqiulin
@@ -10,4 +11,6 @@ import com.sfa.operation.domain.sales.wq.SalesApWq;
  */
 public interface ISalesApDisplayJDao {
     PageInfo page(SalesApWq salesApWq);
+
+    void updateDetail(SalesApDisplayJDto djDto);
 }

src/main/java/com/sfa/operation/domain/sales/dao/ISalesApDisplaySDao.java

@@ -2,6 +2,7 @@ package com.sfa.operation.domain.sales.dao;
 
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.operation.domain.sales.wq.SalesApWq;
+import com.sfa.operation.pojo.sales.response.SalesApDisplaySDto;
 
 /**
  * @author : liqiulin
@@ -10,4 +11,6 @@ import com.sfa.operation.domain.sales.wq.SalesApWq;
  */
 public interface ISalesApDisplaySDao {
     PageInfo page(SalesApWq wq);
+
+    void updateDetail(SalesApDisplaySDto dsDto);
 }

src/main/java/com/sfa/operation/domain/sales/dao/impl/SalesApDisplayJDaoImpl.java

@@ -10,6 +10,8 @@ import com.sfa.operation.domain.sales.dao.ISalesApDisplayJDao;
 import com.sfa.operation.domain.sales.entity.SalesApDisplayJ;
 import com.sfa.operation.domain.sales.mapper.SalesApDisplayJMapper;
 import com.sfa.operation.domain.sales.wq.SalesApWq;
+import com.sfa.operation.pojo.sales.response.SalesApDisplayJDto;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -34,6 +36,13 @@ public class SalesApDisplayJDaoImpl implements ISalesApDisplayJDao {
         return new PageInfo<>(salesApDisplayJPage);
     }
 
+    @Override
+    public void updateDetail(SalesApDisplayJDto djDto) {
+        SalesApDisplayJ entity = new SalesApDisplayJ();
+        BeanUtils.copyProperties(djDto, entity);
+        salesApDisplayJMapper.updateById(entity);
+    }
+
 
     private LambdaQueryWrapper<SalesApDisplayJ> buildWq(SalesApWq salesApWq) {
         LambdaQueryWrapper<SalesApDisplayJ> qw = new LambdaQueryWrapper<>();

src/main/java/com/sfa/operation/domain/sales/dao/impl/SalesApDisplaySDaoImpl.java

@@ -10,6 +10,8 @@ import com.sfa.operation.domain.sales.dao.ISalesApDisplaySDao;
 import com.sfa.operation.domain.sales.entity.SalesApDisplayS;
 import com.sfa.operation.domain.sales.mapper.SalesApDisplaySMapper;
 import com.sfa.operation.domain.sales.wq.SalesApWq;
+import com.sfa.operation.pojo.sales.response.SalesApDisplaySDto;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -34,6 +36,13 @@ public class SalesApDisplaySDaoImpl implements ISalesApDisplaySDao {
         return new PageInfo<>(salesApDisplaySPage);
     }
 
+    @Override
+    public void updateDetail(SalesApDisplaySDto dsDto) {
+        SalesApDisplayS entity = new SalesApDisplayS();
+        BeanUtils.copyProperties(dsDto, entity);
+        salesApDisplaySMapper.updateById(entity);
+    }
+
 
     private LambdaQueryWrapper<SalesApDisplayS> buildWq(SalesApWq salesApWq) {
         LambdaQueryWrapper<SalesApDisplayS> qw = new LambdaQueryWrapper<>();

src/main/java/com/sfa/operation/pojo/sales/request/SalesApRequest.java

@@ -69,6 +69,17 @@ public class SalesApRequest {
     private Long sasdId;
     private SnackDisplay snackDisplay;
 
+    /**
+     * 三米两秒
+     */
+    private Long sadsId;
+    private DisplayS displayS;
+
+    /**
+     * 六小金刚
+     */
+    private Long sadjId;
+    private DisplayJ displayJ;
 
     @Data
     public static class Display{
@@ -243,7 +254,7 @@ public class SalesApRequest {
         private String posterExecutionStatus;
     }
     @Data
-    private class SnackDisplay {
+    private static class SnackDisplay {
 
         /**
          * 实际-陈列形式
@@ -268,7 +279,7 @@ public class SalesApRequest {
         private String snackDisplayExecuted;
     }
     @Data
-    private class PromotionDisplay {
+    private static class PromotionDisplay {
 
         /**
          * 实际端架-数量
@@ -310,6 +321,28 @@ public class SalesApRequest {
          */
         private String promotionDisplayExecuted;
     }
+    @Data
+    private static class DisplayS{
+        /**
+         * 实际-60g挂条陈列数量
+         */
+        private Integer actualDisplayQty60;
+        /**
+         * 60g挂条陈列-是否执行
+         */
+        private String displayQtyExecuted60;
+    }
+    @Data
+    private static class DisplayJ {
+        /**
+         * 实际执行-六小金刚批发挂网
+         */
+        private String actualGw6;
+        /**
+         * 六小金刚批发挂网-是否执行（Y=是，N=否）
+         */
+        private String gwExecuted6;
+    }
 }
 
 

src/main/java/com/sfa/operation/pojo/sales/response/SalesApDisplayJDto.java

+package com.sfa.operation.pojo.sales.response;
+
+import lombok.Data;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-11-21 15
+ * @describe :
+ */
+@Data
+public class SalesApDisplayJDto {
+    private Long sadjId;
+    /**
+     * 实际执行-六小金刚批发挂网
+     */
+    private String actualGw6;
+    /**
+     * 六小金刚批发挂网-是否执行（Y=是，N=否）
+     */
+    private String gwExecuted6;
+    private String updateBy;
+}

src/main/java/com/sfa/operation/pojo/sales/response/SalesApDisplaySDto.java

+package com.sfa.operation.pojo.sales.response;
+
+import lombok.Data;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-11-21 15
+ * @describe :
+ */
+@Data
+public class SalesApDisplaySDto {
+    private Long sadsId;
+    /**
+     * 实际-60g挂条陈列数量
+     */
+    private Integer actualDisplayQty60;
+    /**
+     * 60g挂条陈列-是否执行
+     */
+    private String displayQtyExecuted60;
+    private String updateBy;
+}

src/main/java/com/sfa/operation/service/sales/IApDisplayCoreService.java

@@ -13,4 +13,8 @@ public interface IApDisplayCoreService {
     void putSnackDisplayDetail(SalesApRequest request);
 
     void putProDisplayDetail(SalesApRequest request);
+
+    void putDisplaySDetail(SalesApRequest request);
+
+    void putDisplayJDetail(SalesApRequest request);
 }

src/main/java/com/sfa/operation/service/sales/impl/ApDisplayCoreServiceImpl.java

 package com.sfa.operation.service.sales.impl;
 
 import com.sfa.common.security.utils.SecurityUtils;
-import com.sfa.operation.domain.sales.dao.ISalesApDisplayDao;
-import com.sfa.operation.domain.sales.dao.ISalesApPromotionDisplayDao;
-import com.sfa.operation.domain.sales.dao.ISalesApSnacksDisplayDao;
+import com.sfa.operation.domain.sales.dao.*;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
-import com.sfa.operation.pojo.sales.response.SalesApDisplayDto;
-import com.sfa.operation.pojo.sales.response.SalesApPromotionDisplayDto;
-import com.sfa.operation.pojo.sales.response.SalesApSnacksDisplayDto;
+import com.sfa.operation.pojo.sales.response.*;
 import com.sfa.operation.service.sales.IApDisplayCoreService;
+import org.omg.CORBA.PRIVATE_MEMBER;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +23,10 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
     private ISalesApSnacksDisplayDao salesApSnacksDisplayDao;
     @Autowired
     private ISalesApPromotionDisplayDao salesApPromotionDisplayDao;
+    @Autowired
+    private ISalesApDisplaySDao salesApDisplaySDao;
+    @Autowired
+    private ISalesApDisplayJDao salesApDisplayJDao;
     @Override
     public void updateDetail(SalesApRequest request) {
         SalesApDisplayDto salesApDisplayDto = new SalesApDisplayDto();
@@ -52,4 +53,22 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
         pdDto.setUpdateBy(SecurityUtils.getNickName());
         salesApPromotionDisplayDao.updateDetail(pdDto);
     }
+
+    @Override
+    public void putDisplaySDetail(SalesApRequest request) {
+        SalesApDisplaySDto dsDto = new SalesApDisplaySDto();
+        BeanUtils.copyProperties(request.getDisplayS(), dsDto);
+        dsDto.setSadsId(request.getSadsId());
+        dsDto.setUpdateBy(SecurityUtils.getNickName());
+        salesApDisplaySDao.updateDetail(dsDto);
+    }
+
+    @Override
+    public void putDisplayJDetail(SalesApRequest request) {
+        SalesApDisplayJDto djDto = new SalesApDisplayJDto();
+        BeanUtils.copyProperties(request.getDisplayJ(), djDto);
+        djDto.setSadjId(request.getSadjId());
+        djDto.setUpdateBy(SecurityUtils.getNickName());
+        salesApDisplayJDao.updateDetail(djDto);
+    }
 }