Browse Source

miniapp modify

梁彦春 6 years ago
parent
commit
8426944062

+ 1
- 1
src/main/java/com.huiju.welcome/controller/TaGoodsController.java View File

169
     public ResponseBean goodsListForMiniApp(@RequestParam(defaultValue = "1") int pageNum,
169
     public ResponseBean goodsListForMiniApp(@RequestParam(defaultValue = "1") int pageNum,
170
                                  @RequestParam(defaultValue = "10") int pageSize,
170
                                  @RequestParam(defaultValue = "10") int pageSize,
171
                                  @RequestParam(value = "goodsName",required = false) String goodsName,
171
                                  @RequestParam(value = "goodsName",required = false) String goodsName,
172
-                                 @RequestParam(value = "typeId",required = true) Integer typeId) {
172
+                                 @RequestParam(value = "typeId",required = false) Integer typeId) {
173
         IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
173
         IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
174
 
174
 
175
         ResponseBean userManagement= iTaGoodsService.goodsList(pg,goodsName,typeId);
175
         ResponseBean userManagement= iTaGoodsService.goodsList(pg,goodsName,typeId);

+ 5
- 1
src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java View File

51
      * @return
51
      * @return
52
      */
52
      */
53
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
53
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
54
-    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
54
+    public ResponseBean taGoodsOrdersAdd(@RequestBody String paramStr){
55
         ResponseBean responseBean = new ResponseBean();
55
         ResponseBean responseBean = new ResponseBean();
56
         JSONObject jsonObject = JSONObject.parseObject(paramStr);
56
         JSONObject jsonObject = JSONObject.parseObject(paramStr);
57
         TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
57
         TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
58
         try {
58
         try {
59
             taGoodsOrders.setCreateDate(LocalDateTime.now());
59
             taGoodsOrders.setCreateDate(LocalDateTime.now());
60
             taGoodsOrders.setStatus(StatusUtils.Normal);
60
             taGoodsOrders.setStatus(StatusUtils.Normal);
61
+            Integer recId = iTaGoodsOrdersService.getRecIdByCustomerIdCurrentDate(taGoodsOrders.getCustomerId());
62
+            if(recId != null){
63
+                taGoodsOrders.setRecId(recId);
64
+            }
61
             Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
65
             Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
62
 
66
 
63
             Boolean flagDetail = false;
67
             Boolean flagDetail = false;

+ 1
- 0
src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java View File

31
 
31
 
32
     List<TaMainUsherRecord> getLastList(@Param("personId") Integer personId, @Param("dt") LocalDateTime dt);
32
     List<TaMainUsherRecord> getLastList(@Param("personId") Integer personId, @Param("dt") LocalDateTime dt);
33
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,@Param("phone")String phone,@Param("platNumber")String platNumber,@Param("personName")String personName,@Param("appointment")Integer appointment);
33
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,@Param("phone")String phone,@Param("platNumber")String platNumber,@Param("personName")String personName,@Param("appointment")Integer appointment);
34
+    Integer getRecIdByCustomerIdCurrentDate(@Param("customerId")Integer customerId);
34
 }
35
 }

+ 2
- 0
src/main/java/com.huiju.welcome/model/TaGoodsOrders.java View File

56
 
56
 
57
     private String remark;
57
     private String remark;
58
 
58
 
59
+    private Integer recId;
60
+
59
     @TableField(exist = false)
61
     @TableField(exist = false)
60
     private List<TaGoodsOrdersDetail> detailList;
62
     private List<TaGoodsOrdersDetail> detailList;
61
 
63
 

+ 1
- 3
src/main/java/com.huiju.welcome/service/ITaGoodsOrdersService.java View File

5
 import com.baomidou.mybatisplus.extension.service.IService;
5
 import com.baomidou.mybatisplus.extension.service.IService;
6
 import com.huiju.welcome.common.base.ResponseBean;
6
 import com.huiju.welcome.common.base.ResponseBean;
7
 import com.huiju.welcome.model.TaGoodsOrders;
7
 import com.huiju.welcome.model.TaGoodsOrders;
8
-import com.huiju.welcome.model.TdGoodsType;
9
-import io.swagger.models.auth.In;
10
-
11
 /**
8
 /**
12
  * <p>
9
  * <p>
13
  *  服务类
10
  *  服务类
27
      * @return
24
      * @return
28
      */
25
      */
29
     ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName, Integer userId, String ordersNo, Integer customerId);
26
     ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName, Integer userId, String ordersNo, Integer customerId);
27
+    Integer getRecIdByCustomerIdCurrentDate(Integer customerId);
30
 }
28
 }

+ 9
- 0
src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersServiceImpl.java View File

6
 import com.huiju.welcome.common.base.ResponseBean;
6
 import com.huiju.welcome.common.base.ResponseBean;
7
 import com.huiju.welcome.mapper.TaGoodsOrdersDetailMapper;
7
 import com.huiju.welcome.mapper.TaGoodsOrdersDetailMapper;
8
 import com.huiju.welcome.mapper.TaGoodsOrdersMapper;
8
 import com.huiju.welcome.mapper.TaGoodsOrdersMapper;
9
+import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
9
 import com.huiju.welcome.model.TaGoodsOrders;
10
 import com.huiju.welcome.model.TaGoodsOrders;
10
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
11
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
11
 import com.huiju.welcome.service.ITaGoodsOrdersService;
12
 import com.huiju.welcome.service.ITaGoodsOrdersService;
29
     private TaGoodsOrdersMapper taGoodsOrdersMapper;
30
     private TaGoodsOrdersMapper taGoodsOrdersMapper;
30
     @Autowired
31
     @Autowired
31
     private TaGoodsOrdersDetailMapper taGoodsOrdersDetailMapper;
32
     private TaGoodsOrdersDetailMapper taGoodsOrdersDetailMapper;
33
+    @Autowired
34
+    private TaMainUsherRecordMapper taMainUsherRecordMapper;
32
 
35
 
33
     @Override
36
     @Override
34
     public ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName,Integer userId,String ordersNo,Integer customerId) {
37
     public ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName,Integer userId,String ordersNo,Integer customerId) {
52
         responseBean.addSuccess(list);
55
         responseBean.addSuccess(list);
53
         return responseBean;
56
         return responseBean;
54
     }
57
     }
58
+    @Override
59
+    public Integer getRecIdByCustomerIdCurrentDate(Integer customerId){
60
+        Integer recId = taMainUsherRecordMapper.getRecIdByCustomerIdCurrentDate(customerId);
61
+        return recId;
62
+
63
+    }
55
 
64
 
56
 }
65
 }

+ 10
- 0
src/main/resources/mapper/TaMainUsherRecordMapper.xml View File

42
             t.person_id = #{personId}
42
             t.person_id = #{personId}
43
         AND t.visite_date &gt;= #{dt}
43
         AND t.visite_date &gt;= #{dt}
44
     </select>
44
     </select>
45
+    <select id="getRecIdByCustomerIdCurrentDate" resultType="Integer">
46
+        SELECT
47
+	rec_id
48
+FROM
49
+	ta_main_usher_record
50
+WHERE
51
+	DATE( visite_date ) = curdate( )
52
+	and customer_id = #{customerId}
53
+	LIMIT 1;
54
+    </select>
45
 </mapper>
55
 </mapper>