修改了一些问题

src/main/java/cn/com/tenlion/operator/dao/user/expand/IUserExpandDao.java

@@ -1,6 +1,7 @@
 package cn.com.tenlion.operator.dao.user.expand;
 
 import cn.com.tenlion.operator.pojo.dtos.user.expand.UserExpandDTO;
+import cn.com.tenlion.operator.pojo.pos.user.expand.UserExpandPO;
 import org.springframework.stereotype.Repository;
 
 import java.util.Map;
@@ -21,4 +22,6 @@ public interface IUserExpandDao {
 
     UserExpandDTO get(Map<String, Object> params);
 
+    UserExpandPO getPO(Map<String, Object> params);
+
 }

src/main/java/cn/com/tenlion/operator/pojo/pos/user/expand/UserExpandPO.java

@@ -0,0 +1,66 @@
+package cn.com.tenlion.operator.pojo.pos.user.expand;
+
+/**
+ * @ClassName: UserExpandDTO
+ * @Description:
+ * @Author: wanggeng
+ * @Date: 2024/6/11 上午10:39
+ * @Version: 1.0
+ */
+public class UserExpandPO {
+
+    private Long priceAdditionalPkg;
+    private Long priceAdditionalVideoDemo;
+    private Long priceAll;
+    private Long priceMaterial;
+    private Long priceMaterialAgent;
+    private Long priceMaterialAgentUrgent;
+
+    public Long getPriceAdditionalPkg() {
+        return priceAdditionalPkg == null ? 0 : priceAdditionalPkg;
+    }
+
+    public void setPriceAdditionalPkg(Long priceAdditionalPkg) {
+        this.priceAdditionalPkg = priceAdditionalPkg;
+    }
+
+    public Long getPriceAdditionalVideoDemo() {
+        return priceAdditionalVideoDemo == null ? 0 : priceAdditionalVideoDemo;
+    }
+
+    public void setPriceAdditionalVideoDemo(Long priceAdditionalVideoDemo) {
+        this.priceAdditionalVideoDemo = priceAdditionalVideoDemo;
+    }
+
+    public Long getPriceAll() {
+        return priceAll == null ? 0 : priceAll;
+    }
+
+    public void setPriceAll(Long priceAll) {
+        this.priceAll = priceAll;
+    }
+
+    public Long getPriceMaterial() {
+        return priceMaterial == null ? 0 : priceMaterial;
+    }
+
+    public void setPriceMaterial(Long priceMaterial) {
+        this.priceMaterial = priceMaterial;
+    }
+
+    public Long getPriceMaterialAgent() {
+        return priceMaterialAgent == null ? 0 : priceMaterialAgent;
+    }
+
+    public void setPriceMaterialAgent(Long priceMaterialAgent) {
+        this.priceMaterialAgent = priceMaterialAgent;
+    }
+
+    public Long getPriceMaterialAgentUrgent() {
+        return priceMaterialAgentUrgent == null ? 0 : priceMaterialAgentUrgent;
+    }
+
+    public void setPriceMaterialAgentUrgent(Long priceMaterialAgentUrgent) {
+        this.priceMaterialAgentUrgent = priceMaterialAgentUrgent;
+    }
+}

src/main/java/cn/com/tenlion/operator/service/login/handler/LoginHandlerServiceImpl.java

@@ -0,0 +1,25 @@
+package cn.com.tenlion.operator.service.login.handler;
+
+import cn.com.tenlion.operator.pojo.pos.user.expand.UserExpandPO;
+import cn.com.tenlion.operator.service.user.expand.UserExpandServiceImpl;
+import ink.wgink.interfaces.expand.login.ILoginHandlerService;
+import ink.wgink.interfaces.user.IUserExpandBaseService;
+import ink.wgink.pojo.bos.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LoginHandlerServiceImpl implements ILoginHandlerService {
+
+    @Autowired
+    private UserExpandServiceImpl userExpandService;
+
+    @Override
+    public void handle(LoginUser loginUser) throws Exception {
+        UserExpandPO po = userExpandService.getPO(loginUser.getUserId());
+        if (po == null) {
+            po = new UserExpandPO();
+        }
+        loginUser.setExpandData(po);
+    }
+}

src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.tenlion.operator.service.user.expand;
 
 import cn.com.tenlion.operator.dao.user.expand.IUserExpandDao;
 import cn.com.tenlion.operator.pojo.dtos.user.expand.UserExpandDTO;
+import cn.com.tenlion.operator.pojo.pos.user.expand.UserExpandPO;
 import cn.com.tenlion.operator.pojo.vos.user.expand.UserExpandVO;
 import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.exceptions.SearchException;
@@ -51,6 +52,12 @@ public class UserExpandServiceImpl extends DefaultBaseService implements IUserEx
         return get(userDTO);
     }
 
+    public UserExpandPO getPO(String userId) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("userId", userId);
+        return userExpandDao.getPO(params);
+    }
+
     private UserExpandDTO get(UserDTO userDTO) {
         if (userDTO == null) {
             throw new SearchException("用户不存在");

src/main/resources/mybatis/mapper/user/expand/user-expand.xml

@@ -11,6 +11,15 @@
         <result column="price_material_agent_urgent" property="priceMaterialAgentUrgent"/>
     </resultMap>
 
+    <resultMap id="userExpandPO" type="cn.com.tenlion.operator.pojo.pos.user.expand.UserExpandPO">
+        <result column="price_additional_pkg" property="priceAdditionalPkg"/>
+        <result column="price_additional_video_demo" property="priceAdditionalVideoDemo"/>
+        <result column="price_all" property="priceAll"/>
+        <result column="price_material" property="priceMaterial"/>
+        <result column="price_material_agent" property="priceMaterialAgent"/>
+        <result column="price_material_agent_urgent" property="priceMaterialAgentUrgent"/>
+    </resultMap>
+
     <insert id="save" parameterType="map">
         INSERT INTO sys_user_expand (
             user_id,
@@ -61,4 +70,20 @@
             </if>
     </select>
 
+    <select id="getPO" parameterType="map" resultMap="userExpandPO">
+        SELECT
+            price_additional_pkg,
+            price_additional_video_demo,
+            price_all,
+            price_material,
+            price_material_agent,
+            price_material_agent_urgent
+        FROM
+            sys_user_expand
+        WHERE
+            <if test="userId != null and userId != ''">
+            user_id = #{userId}
+            </if>
+    </select>
+
 </mapper>

src/main/resources/templates/user/expand/save-or-update.html

@@ -20,9 +20,9 @@
     <div class="layui-card">
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <blockquote class="layui-elem-quote">价格设置￥，保留两位小数，使用系统默认金额，设置为0即可</blockquote>
+                <blockquote class="layui-elem-quote">【项目价格设置】单位为<b>元（￥）</b>，可保留两位小数，如要使用系统默认金额，设置为0即可</blockquote>
                 <div class=" layui-row layui-col-space15">
-                    <div class="layui-col-xs4">
+                    <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label layui-form-label-new">全托管</label>
                             <div class="layui-input-block layui-input-block-new">
@@ -30,7 +30,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-xs4">
+                    <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label layui-form-label-new">写材料</label>
                             <div class="layui-input-block layui-input-block-new">
@@ -38,7 +38,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-xs4">
+                    <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label layui-form-label-new">写材料+代理</label>
                             <div class="layui-input-block layui-input-block-new">
@@ -46,9 +46,7 @@
                             </div>
                         </div>
                     </div>
-                </div>
+                    <div class="layui-col-xs6">
-                <div class=" layui-row layui-col-space15">
-                    <div class="layui-col-xs4">
                         <div class="layui-form-item">
                             <label class="layui-form-label layui-form-label-new">写材料+代理（加急）</label>
                             <div class="layui-input-block layui-input-block-new">
@@ -56,15 +54,18 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-xs4">
+                </div>
+                <blockquote class="layui-elem-quote" style="margin-top: 15px;">【项目附加费用】单位为<b>元（￥）</b>，可保留两位小数，如要使用系统默认金额，设置为0即可</blockquote>
+                <div class=" layui-row layui-col-space15">
+                    <div class="layui-col-xs6">
                         <div class="layui-form-item">
-                            <label class="layui-form-label layui-form-label-new">拓展安装包</label>
+                            <label class="layui-form-label layui-form-label-new">安装包</label>
                             <div class="layui-input-block layui-input-block-new">
-                                <input type="number" id="priceAdditionalPkg" name="priceAdditionalPkg" class="layui-input" value="" placeholder="拓展安装包价格"  maxlength="50">
+                                <input type="number" id="priceAdditionalPkg" name="priceAdditionalPkg" class="layui-input" value="" placeholder="安装包价格"  maxlength="50">
                             </div>
                         </div>
                     </div>
-                    <div class="layui-col-xs4">
+                    <div class="layui-col-xs6">
                         <div class="layui-form-item">
                             <label class="layui-form-label layui-form-label-new">视频教程</label>
                             <div class="layui-input-block layui-input-block-new">