miniapp modify

src/main/java/com.huiju.welcome/controller/TaGoodsController.java

@@ -169,7 +169,7 @@ public class TaGoodsController extends BaseController {
     public ResponseBean goodsListForMiniApp(@RequestParam(defaultValue = "1") int pageNum,
                                  @RequestParam(defaultValue = "10") int pageSize,
                                  @RequestParam(value = "goodsName",required = false) String goodsName,
-                                 @RequestParam(value = "typeId",required = true) Integer typeId) {
+                                 @RequestParam(value = "typeId",required = false) Integer typeId) {
         IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
 
         ResponseBean userManagement= iTaGoodsService.goodsList(pg,goodsName,typeId);

src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java

@@ -51,13 +51,17 @@ public class TaGoodsOrdersController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
-    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
+    public ResponseBean taGoodsOrdersAdd(@RequestBody String paramStr){
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramStr);
         TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
         try {
             taGoodsOrders.setCreateDate(LocalDateTime.now());
             taGoodsOrders.setStatus(StatusUtils.Normal);
+            Integer recId = iTaGoodsOrdersService.getRecIdByCustomerIdCurrentDate(taGoodsOrders.getCustomerId());
+            if(recId != null){
+                taGoodsOrders.setRecId(recId);
+            }
             Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
 
             Boolean flagDetail = false;

src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java

@@ -31,4 +31,5 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
 
     List<TaMainUsherRecord> getLastList(@Param("personId") Integer personId, @Param("dt") LocalDateTime dt);
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,@Param("phone")String phone,@Param("platNumber")String platNumber,@Param("personName")String personName,@Param("appointment")Integer appointment);
+    Integer getRecIdByCustomerIdCurrentDate(@Param("customerId")Integer customerId);
 }

src/main/java/com.huiju.welcome/model/TaGoodsOrders.java

@@ -56,6 +56,8 @@ public class TaGoodsOrders implements Serializable {
 
     private String remark;
 
+    private Integer recId;
+
     @TableField(exist = false)
     private List<TaGoodsOrdersDetail> detailList;
 

src/main/java/com.huiju.welcome/service/ITaGoodsOrdersService.java

@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoodsOrders;
-import com.huiju.welcome.model.TdGoodsType;
-import io.swagger.models.auth.In;
-
 /**
  * <p>
  *  服务类
@@ -27,4 +24,5 @@ public interface ITaGoodsOrdersService extends IService<TaGoodsOrders> {
      * @return
      */
     ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName, Integer userId, String ordersNo, Integer customerId);
+    Integer getRecIdByCustomerIdCurrentDate(Integer customerId);
 }

src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaGoodsOrdersDetailMapper;
 import com.huiju.welcome.mapper.TaGoodsOrdersMapper;
+import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
 import com.huiju.welcome.model.TaGoodsOrders;
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
 import com.huiju.welcome.service.ITaGoodsOrdersService;
@@ -29,6 +30,8 @@ public class TaGoodsOrdersServiceImpl extends ServiceImpl<TaGoodsOrdersMapper, T
     private TaGoodsOrdersMapper taGoodsOrdersMapper;
     @Autowired
     private TaGoodsOrdersDetailMapper taGoodsOrdersDetailMapper;
+    @Autowired
+    private TaMainUsherRecordMapper taMainUsherRecordMapper;
 
     @Override
     public ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName,Integer userId,String ordersNo,Integer customerId) {
@@ -52,5 +55,11 @@ public class TaGoodsOrdersServiceImpl extends ServiceImpl<TaGoodsOrdersMapper, T
         responseBean.addSuccess(list);
         return responseBean;
     }
+    @Override
+    public Integer getRecIdByCustomerIdCurrentDate(Integer customerId){
+        Integer recId = taMainUsherRecordMapper.getRecIdByCustomerIdCurrentDate(customerId);
+        return recId;
+
+    }
 
 }

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -42,4 +42,14 @@
             t.person_id = #{personId}
         AND t.visite_date >= #{dt}
     </select>
+    <select id="getRecIdByCustomerIdCurrentDate" resultType="Integer">
+        SELECT
+	rec_id
+FROM
+	ta_main_usher_record
+WHERE
+	DATE( visite_date ) = curdate( )
+	and customer_id = #{customerId}
+	LIMIT 1;
+    </select>
 </mapper>