Browse Source

fix of 下单制2.0 on 2021.1.22

jiequan.bi 4 years ago
parent
commit
05832e92d7

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformScriptService.java

@@ -1,9 +1,13 @@
 package org.jeecg.modules.orderplatform.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.modules.orderplatform.entity.PlatformScript;
+import org.json.JSONObject;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  *  下单平台关联脚本
  */
@@ -11,4 +15,6 @@ public interface IPlatformScriptService extends IService<PlatformScript> {
 
     PlatformScript saveScript(MultipartFile file ,Long projectId);
 
+    PageInfo<JSONObject> page(Long projectId , String name, String creator,int pageNo,int  pageSize);
+
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformOrderServiceImpl.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.orderplatform.entity.PlatformOrder;
 import org.jeecg.modules.orderplatform.mapper.PlatformOrderMapper;
 import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
 import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
+import org.jeecg.modules.orderplatform.util.ApprovalNodeNoticeHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +29,9 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
     @Autowired
     PlatformOrderMapper platformOrderMapper;
 
+    @Autowired
+    ApprovalNodeNoticeHandler approvalNodeNoticeHandler;
+
     @Override
     public boolean generateMaterials(PlatformOrder platformOrder) {
         boolean result=false;
@@ -58,6 +62,7 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
         if(platformOrder.getMaterialAmount().equals(platformOrder.getMaterialFinishAmount())){
             platformOrder.setOrderStatus(3);
             platformOrder.setOrderFinishTime(DateUtils.getDate());
+            approvalNodeNoticeHandler.NOTICE_WE_CHAT_ORDER("ORDER_END",code);
         }
         return this.updateById(platformOrder);
     }

+ 9 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/ApprovalNodeNoticeHandler.java

@@ -90,6 +90,15 @@ public class ApprovalNodeNoticeHandler {
                                 orderRelatePerson.getString("operatorName")));
                 break;
 
+            //订单完结
+            case "ORDER_END":
+                sendWeChat(orderRelatePerson.getString("design"),
+                        String.format("您的订单“%s”物料已全部制作完成,订单已被系统自动完结\n 订单ID:%s\n操作人:%s",
+                                orderRelatePerson.getString("orderTitle"),
+                                orderRelatePerson.getLong("orderId"),
+                                orderRelatePerson.getString("operatorName")));
+                break;
+
             //脚本上传成功,通知运营审核
             case "SCRIPT":
                 sendWeChat(materialRelatePerson.getString("operator"),