Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/infrastructure/config/Config.java

@@ -5,6 +5,8 @@ import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.List;
+
 /**
  * <b>
  * description: com.dk.mdm.infrastructure.config
@@ -133,5 +135,5 @@ public class Config {
      * @date   : 2024/07/22 10:03
      */
     @Value("${wx.miniMessageModelIds}")
-    private String[] miniMessageModelIds;
+    private List<String> miniMessageModelIds;
 }

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -845,9 +845,9 @@ public class InventoryService extends BaseService<Inventory> {
                 //库存数量
                 inventoryBatch.setInvQty(inOutRecordVO.getIntoQty().abs());
                 //库存单价
-                inventoryBatch.setCostPrice(inOutRecordVO.getPriceInto().abs());
+                inventoryBatch.setCostPrice(inOutRecordVO.getCostPrice().abs());
                 //货物资产
-                inventoryBatch.setCostAmt(inOutRecordVO.getIntoAmt().abs());
+                inventoryBatch.setCostAmt(inOutRecordVO.getCostAmt().abs());
             } else {
                 //库存数量
                 inventoryBatch.setInvQty(inOutRecordVO.getIntoQty());

src/main/java/com/dk/mdm/service/mst/CusFollowService.java

@@ -480,7 +480,7 @@ public class CusFollowService extends BaseService<CusFollow> {
 //                      mapMessage.put("keywordMap", keywordMap);
                         mapMessage.put("remark", "客户跟进备注");
 //                      sendUniformMessage(mapMessage);
-                        String[] miniMessageModelIds = config.getMiniMessageModelIds();
+                        List<String> miniMessageModelIds = config.getMiniMessageModelIds();
                         // 构造对应的显示信息 和模板数据结构对应
                         JSONObject data = new JSONObject();
                         data.put("time4", createDataItem("value", String.valueOf(keywordMap.get("followTime"))));
@@ -488,7 +488,7 @@ public class CusFollowService extends BaseService<CusFollow> {
                         data.put("phone_number2", createDataItem("value", String.valueOf(keywordMap.get("cusPhone"))));
                         data.put("thing6", createDataItem("value", String.valueOf(keywordMap.get("remark"))));
                         data.put("thing5", createDataItem("value", String.valueOf(mapMessage.get("remark"))));
-                        wxMessagePush(miniMessageModelIds[0], data, mapMessage);
+                        wxMessagePush(miniMessageModelIds.get(0), data, mapMessage);
                     }
                 }
 

src/main/resources/dev/bootstrap.yml

@@ -116,7 +116,8 @@ wx:
   wxPublicAccountAppSecret: 78a99837c113756599d1748b813ca698
   templateId: V5Ju7-8BfDKJJm1HgH4j5km68rPs777pMVJ0_MKqR00
   # 微信小程序订阅消息模板id列表
-  miniMessageModelIds: ["z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA"]
+  miniMessageModelIds:
+    z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA
 
   # 支付的信息
   pay: