添加 / 编辑二手估价商品

src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -2,6 +2,7 @@ package com.caimei.modules.order.dao;
 
 import com.caimei.modules.order.entity.CmPayShop;
 import com.caimei.modules.order.entity.NewShopOrder;
+import com.caimei.modules.order.entity.SettleRecord;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -193,7 +193,101 @@ public class CmSecondHandDetailController extends BaseController {
         model.addAttribute("cmSecondHandDetail", cmSecondHandDetail);
         return "modules/product/cmSecondHandDetailForm";
     }
-//   http://192.168.2.101/api/2022%E5%B9%B4/2022%E5%B9%B4%E5%B0%8F%E9%9C%80%E6%B1%82
+
+    @RequestMapping(value = "cmSecondDetailForm")
+    public String cmSecondDetailForm(CmSecondHandDetail cmSecondHandDetail,HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
+        // 解析二手商品小分类
+        List<BigType> bigTypeList = new ArrayList<>();
+        String instrumentType = cmSecondHandDetail.getInstrumentType();
+        if (StringUtils.isNoneEmpty(instrumentType)) {
+            String[] split = instrumentType.split(",");
+            int length = split.length;
+            bigTypeList = initList(bigTypeList, length, split);
+        }
+        cmSecondHandDetail.setBigTypeList(bigTypeList);
+
+        // 初始化品牌
+        List<CmBrand> brandList = cmBrandService.getList();
+        model.addAttribute("brandList", brandList);
+
+        // 构造类型
+        List<BigType> typeList = new ArrayList<>();
+        BigType bigType = new BigType();
+        /*BigType bigType1 = new BigType();
+        BigType bigType2 = new BigType();*/
+        bigType.setId("1");
+        bigType.setName("美容仪器");
+/*        bigType1.setId("2");
+        bigType1.setName("重光电");
+        bigType2.setId("3");
+        bigType2.setName("耗材配件");*/
+        typeList.add(bigType);
+        /*typeList.add(bigType1);
+        typeList.add(bigType2);*/
+        model.addAttribute("typeList", typeList);
+
+        //初始化城市信息
+        Integer townId = cmSecondHandDetail.getTownId();
+        if (null != townId) {
+            Address addByTownId = cmSecondHandTransactionService.getAddByTownId(townId);
+            if (null != addByTownId) {
+                String province = addByTownId.getProvince();
+                String city = addByTownId.getCity();
+                String town = addByTownId.getTown();
+                cmSecondHandDetail.setProvince(province);
+                cmSecondHandDetail.setCity(city);
+                cmSecondHandDetail.setTown(town);
+            }
+        }
+
+        // 初始化到期时间
+        Date onLineDate = cmSecondHandDetail.getOnLineDate();
+        if (null != onLineDate) {
+            // 计算是否还在180天内有效
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(onLineDate);
+            //设置为day月前
+            ca.add(Calendar.MONTH, 3);
+            onLineDate = ca.getTime();
+            cmSecondHandDetail.setOnLineDate(onLineDate);
+        }
+
+        // 初始化商品图片
+        List<String> imaglist = new ArrayList<String>();
+        List<ProductImage> imageList = productNewService.getImageList(cmSecondHandDetail.getProductID());
+        if (CollectionUtils.isNotEmpty(imageList) && imageList.size() > 0) {
+            for (int i = 1; i <= imageList.size(); i++) {
+                if (i == 1) {
+                    cmSecondHandDetail.setImage1(imageList.get(i - 1).getImage());
+                }
+                if (i == 2) {
+                    cmSecondHandDetail.setImage2(imageList.get(i - 1).getImage());
+                }
+                if (i == 3) {
+                    cmSecondHandDetail.setImage3(imageList.get(i - 1).getImage());
+                }
+                if (i == 4) {
+                    cmSecondHandDetail.setImage4(imageList.get(i - 1).getImage());
+                }
+                if (i == 5) {
+                    cmSecondHandDetail.setImage5(imageList.get(i - 1).getImage());
+                }
+                imaglist.add(imageList.get(i - 1).getImage());
+            }
+        }
+        cmSecondHandDetail.setImageList(imaglist);
+
+        if (StringUtils.isNotBlank(cmSecondHandDetail.getOssName()) && StringUtils.isNotBlank(cmSecondHandDetail.getFileName())) {
+            String ossUrl = OSSUtils.getOssUrl(cmSecondHandDetail.getOssName());
+            cmSecondHandDetail.setUrl(ossUrl);
+        }
+
+        cmSecondHandDetailService.setValue(cmSecondHandDetail);
+        List<SplitCode> splitCodeList = productNewDao.findSecondSplitCode(cmSecondHandDetail.getId());
+        model.addAttribute("splitCodeList",splitCodeList);
+        model.addAttribute("cmSecondHandDetail", cmSecondHandDetail);
+        return "modules/product/cmSecondDetailForm";
+    }
 
     @RequiresPermissions("product:cmSecondHandDetail:edit")
     @RequestMapping(value = "save")

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -673,7 +673,6 @@
             </c:if>
         </c:forEach>
             </table>
-        </c:if>
         <%--默认状态代码--%>
         <c:if test="${shopOrder.defaultStatus}">
             <table id="shopOrderTable${status.index}"
@@ -795,7 +794,6 @@
                 </c:forEach>
             </table>
         </c:if>
-    </c:forEach>
     <div class="form-actions">
                 <input id="btnSubmit" class="btn btn-primary" type="submit" value="申 请"/>&nbsp;
 

src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp

@@ -20,7 +20,7 @@
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/product/new/list?searchProductCategory=2">二手商品列表</a></li>
     <li><a href="${ctx}/product/cmSecondHandDetail/form?searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">添加二手商品</a></li>
-<%--    <li><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm">二手估价商品添加 / 编辑</a></li>--%>
+    <li><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm">二手估价商品添加 / 编辑</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="product" action="${ctx}/product/new/list" method="post" class="breadcrumb form-search">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

src/main/webapp/WEB-INF/views/modules/product/cmSecondDetailForm.jsp

@@ -301,7 +301,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/product/new/list?searchProductCategory=2">二手商品列表</a></li>
-    <li class="active"><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm">二手估价商品添加 / 编辑</a></li>
+    <li class="active"><a href="${ctx}/product/cmSecondHandDetail/cmSecondDetailForm?searchName=${searchName}&searchShopID=${searchShopID}&searchShopName=${searchShopName}&searchBigTypeID=${searchBigTypeID}&searchSmallTypeID=${searchSmallTypeID}&searchTinyTypeID=${searchTinyTypeID}&searchValidFlag=${searchValidFlag}&searchActStatus=${searchActStatus}&searchProductType=${searchProductType}&searchBrandID=${searchBrandID}&searchPreferredFlag=${searchPreferredFlag}&fileTypes=999">二手估价商品添加 / 编辑</a></li>
 </ul>
 <br/>
 <form:form id="inputForm" modelAttribute="cmSecondHandDetail"
@@ -351,22 +351,7 @@
             <form:radiobutton path="sold" value="1" label="已售"/>
         </div>
     </div>
-    <%--	<div class="control-group">--%>
-    <%--		<label class="control-label"><font color="red">*</font>付款状态：</label>--%>
-    <%--		<div class="controls">--%>
-    <%--			<form:select path="payStatus" class="input-mini required">--%>
-    <%--				<form:option value="3" checked="true">无需付款</form:option>--%>
-    <%--				<form:option value="1">待付款</form:option>--%>
-    <%--				<form:option value="2">已付款</form:option>--%>
-    <%--			</form:select>--%>
-    <%--		</div>--%>
-    <%--	</div>--%>
-    <%--	<div class="control-group payAmount">--%>
-    <%--		<label class="control-label"><font color="red">*</font>付款金额：¥ </label>--%>
-    <%--		<div class="controls">--%>
-    <%--			<input id="payAmount" name="payAmount"  maxlength="11" style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px" onkeyup="num(this)" value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.payAmount}' pattern='0.00'/>"  class="input-xlarge required"/>--%>
-    <%--		</div>--%>
-    <%--	</div>--%>
+
     <div class="control-group">
         <label class="control-label">浏览量：</label>
         <div class="controls">
@@ -388,8 +373,8 @@
             <form:radiobutton path="secondHandType" value="3" label="其他"/>
         </div>
         <div class="controls c-s bigTypeList" style="margin-left: 181px">
-<%--            <form:checkboxes path="bigTypeList" items="" itemLabel="name" itemValue="id" htmlEscape="false"--%>
-<%--                             class="input-small  stylema required"/>--%>
+            <form:checkboxes path="bigTypeList" items="${typeList}" itemLabel="name" itemValue="id" htmlEscape="false"
+                             class="input-small  stylema required"/>
         </div>
     </div>
     <div class="control-group">
@@ -404,17 +389,17 @@
         </div>
     </div>
     <c:if test="${not empty cmSecondHandDetail.id}">
-    <div class="control-group">
-        <label class="control-label">线上分账账号：</label>
-        <div class="controls">
-            <form:select path="splitCode" class="select-ele input-medium">
-                <form:option value="" label="请选择"/>
-                <c:forEach items="${splitCodeList}" var="splitCodeList" varStatus="index">
-                    <form:option value="${splitCodeList.splitCode}" label="${splitCodeList.codeRemark}"/>
-                </c:forEach>
-            </form:select>
+        <div class="control-group">
+            <label class="control-label">线上分账账号：</label>
+            <div class="controls">
+                <form:select path="splitCode" class="select-ele input-medium">
+                    <form:option value="" label="请选择"/>
+                    <c:forEach items="${splitCodeList}" var="splitCodeList" varStatus="index">
+                        <form:option value="${splitCodeList.splitCode}" label="${splitCodeList.codeRemark}"/>
+                    </c:forEach>
+                </form:select>
+            </div>
         </div>
-    </div>
     </c:if>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>商品品牌：</label>
@@ -443,12 +428,7 @@
             <form:input path="fixedYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>
         </div>
     </div>
-<%--    <div class="control-group maturityYears showClassDiv">--%>
-<%--        <label class="control-label"><font color="red">*</font>产品到期日期：</label>--%>
-<%--        <div class="controls">--%>
-<%--            <form:input path="maturityYears" htmlEscape="false" maxlength="50" class="input-xlarge"/>--%>
-<%--        </div>--%>
-<%--    </div>--%>
+
     <div class="control-group" id="gsmc">
         <label class="control-label"><font color="red">*</font>公司名称：</label>
         <div class="controls">
@@ -469,30 +449,7 @@
             </label>
         </div>
     </div>
-<%--    <div class="control-group showClassDiv">--%>
-<%--        <label class="control-label"><font color="red">*</font>市场价：</label>--%>
-<%--        <div class="controls">--%>
-<%--            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
-<%--                   id="normalPrice" name="normalPrice"--%>
-<%--                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.normalPrice}' pattern='0.00'/>"--%>
-<%--                   onkeyup="num(this)" class="input-xlarge"/>--%>
-<%--        </div>--%>
-<%--    </div>--%>
-<%--    <div class="control-group showClassDiv">--%>
-<%--        <label class="control-label"><font color="red">*</font>采购价/原价：</label>--%>
-<%--        <div class="controls">--%>
-<%--            <input style="padding-left: 7px;padding-top: 8px;border-radius: 4px;background: white;border: 1px solid #ccc;padding-right: 5px"--%>
-<%--                   id="originalPrice" name="originalPrice"--%>
-<%--                   value="<fmt:formatNumber type='number' value='${cmSecondHandDetail.originalPrice}' pattern='0.00'/>"--%>
-<%--                   onkeyup="num(this)" class="input-xlarge"/>--%>
-<%--        </div>--%>
-<%--    </div>--%>
-<%--    <div class="control-group showClassDiv">--%>
-<%--        <label class="control-label"><font color="red">*</font>数量：</label>--%>
-<%--        <div class="controls">--%>
-<%--            <form:input path="stock" htmlEscape="false" class="input-xlarge  number"/>--%>
-<%--        </div>--%>
-<%--    </div>--%>
+
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>成本：</label>
         <div class="controls">
@@ -894,7 +851,7 @@
         })
     });
     $(function () {
-        // 加载地址
+         // 加载地址
         loadProvince();
 
         // 初始化付款状态