排菜接口+同步排菜

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/test/ListenerTemplate.java

@@ -19,16 +19,13 @@ import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
 import me.zhengjie.modules.dm.order.service.DmOrderItemService;
 import me.zhengjie.modules.dm.order.service.DmOrderPaymentService;
 import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
-import me.zhengjie.modules.dm.order.service.dto.DmExpenseCalendar;
-import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.domain.User;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.amqp.core.Message;
 import org.springframework.stereotype.Component;
 
 import java.io.UnsupportedEncodingException;
-import java.util.List;
+import java.sql.Timestamp;
 import java.util.UUID;
 
 @Component
@@ -73,6 +70,7 @@ public class ListenerTemplate {
                 dmDayPc.setPstate(attendance.getInteger("pstate"));
                 dmDayPc.setWindowName(attendance.getString("window_name"));
                 dmDayPc.setCateName(attendance.getString("cate_name"));
+                dmDayPc.setDate(new Timestamp(System.currentTimeMillis()));
 
                 dmDayPcService.create(dmDayPc);
                 System.out.println("新增dmDayPc===" + dmDayPc);
@@ -91,6 +89,7 @@ public class ListenerTemplate {
 
     @RabbitListener(queues = OrderProduce.NAME_ORDER, containerFactory = OrderProduce.LISTENER_ORDER)
     public void dealDeclareOrderMessage(Message message) throws UnsupportedEncodingException {
+        System.out.println("messageOrder"+message);
         String str = new String(message.getBody(),"utf-8");
         System.out.println("receiveOrder:"+str);
         try {

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/repository/DmDayPcRepository.java

@@ -31,8 +31,8 @@ import java.util.Map;
 **/
 public interface DmDayPcRepository extends JpaRepository<DmDayPc, Long>, JpaSpecificationExecutor<DmDayPc> {
 
-    @Query(value = "SELECT DISTINCT a.`pcid`, `pid`, a.`id`, a.`name`, a.`price`, `times`, `cate`, `cate_name`," +
-            " `window`, `window_name`, a.`pstate`, `seq`, `date`, `shopname`,0 as `food.id`,null as `food.code`," +
+    @Query(value = "SELECT DISTINCT a.`pcid`, `pid`, a.`id`, a.`name`, a.`price`, `times`, `cate`, `cate_name`, a.`state`, " +
+            " `window`, `window_name`, a.`pstate`, a.`barcode`, a.`no`, a.`goods`, a.`pinyin`, a.`qty_book`, `seq`, `date`, `shopname`,0 as `food.id`,null as `food.code`," +
             "null as `food.name`,null as `food.type`,null as `food.price`,null as `food.picture`,null as `food.remark`," +
             "null as `food.create_by`,null as `food.update_by`,null as `food.create_time`,null as `food.update_time`," +
             "0 as `food.num` FROM dm_day_pc a LEFT JOIN dm_food b ON a.pid=b.id " +

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/domain/DmFoodPj.java

@@ -19,6 +19,8 @@ import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
+import me.zhengjie.modules.dm.user.domain.DmUser;
+
 import javax.persistence.*;
 import javax.validation.constraints.*;
 import java.sql.Timestamp;
@@ -56,9 +58,10 @@ public class DmFoodPj implements Serializable {
     @ApiModelProperty(value = "菜品分类")
     private String foodType;
 
-    @Column(name = "user_code")
+    @OneToOne
+    @JoinColumn(name = "user_code",referencedColumnName = "id")
     @ApiModelProperty(value = "用户工号")
-    private String userCode;
+    private DmUser userCode;
 
     @Column(name = "user_name")
     @ApiModelProperty(value = "用户姓名")

eladmin-system/src/main/java/me/zhengjie/modules/dm/foodPj/service/dto/DmFoodPjDto.java

@@ -20,6 +20,7 @@ import java.sql.Timestamp;
 import java.io.Serializable;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
+import me.zhengjie.modules.dm.user.domain.DmUser;
 
 /**
 * @website https://el-admin.vip
@@ -46,7 +47,7 @@ public class DmFoodPjDto implements Serializable {
     private String foodType;
 
     /** 用户工号 */
-    private String userCode;
+    private DmUser userCode;
 
     /** 用户姓名 */
     private String userName;