Merge remote-tracking branch 'origin/developer' into developerF

src/main/java/com/caimei/modules/hehe/entity/CmHeheProduct.java

@@ -27,6 +27,7 @@ public class CmHeheProduct extends DataEntity<CmHeheProduct> {
     private String costType;        // 成本价类型：1固定成本 2比例成本
     private BigDecimal costPrice;        // 成本价
     private BigDecimal costProportional;        // 比例成本百分比
+    private Integer oldProductId;   //旧商品id
     private Date addTime;        // 添加时间
     private String name;         //商品名称
     private String mainImage;       //商品图片
@@ -184,4 +185,12 @@ public class CmHeheProduct extends DataEntity<CmHeheProduct> {
     public void setFloorIds(String floorIds) {
         this.floorIds = floorIds;
     }
+
+    public Integer getOldProductId() {
+        return oldProductId;
+    }
+
+    public void setOldProductId(Integer oldProductId) {
+        this.oldProductId = oldProductId;
+    }
 }

src/main/java/com/caimei/modules/newhome/web/AnnouncementController.java

@@ -28,7 +28,7 @@ public class AnnouncementController extends BaseController {
     @Autowired
     AnnouncementService announcementService;
 
-    @RequiresPermissions("newhome:announcementList:view")
+
     @RequestMapping(value = {""})
     public String list(Announcementmanagement announcementmanagement, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<Announcementmanagement> page = announcementService.findPage(new Page<Announcementmanagement>(request, response), announcementmanagement);
@@ -36,7 +36,7 @@ public class AnnouncementController extends BaseController {
         return "modules/newhome/announcementList";
     }
 
-    @RequiresPermissions("newhome:announcementForm:view")
+
     @RequestMapping(value = "form")
     public String form(Announcementmanagement announcementmanagement, Model model) {
         if (!announcementmanagement.getId().equals(null) || !announcementmanagement.getId().equals("")) {
@@ -47,7 +47,7 @@ public class AnnouncementController extends BaseController {
         return "modules/newhome/announcementForm";
     }
 
-    @RequiresPermissions("newhome:announcementForm:view")
+
     @RequestMapping(value = "forms")
     public String forms(Announcementmanagement announcementmanagement, Model model) {
 
@@ -55,7 +55,7 @@ public class AnnouncementController extends BaseController {
     }
 
 
-    @RequiresPermissions("newhome:announcementForm:view")
+
     @RequestMapping(value = "save")
     public String save(Announcementmanagement announcementmanagement, Model model) {
         System.out.println("*************用户id"+announcementmanagement.getId());
@@ -71,7 +71,7 @@ public class AnnouncementController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/newhome/Announcement/";
     }
 
-    @RequiresPermissions("newhome:announcementForm:view")
+
     @RequestMapping(value = "line")
     public String line(Announcementmanagement announcementmanagement, Model model, HttpServletRequest request, HttpServletResponse response) {
             Date date = new Date();
@@ -81,7 +81,7 @@ public class AnnouncementController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/newhome/Announcement/";
     }
 
-    @RequiresPermissions("newhome:announcementForm:view")
+
     @RequestMapping(value = "online")
     public String online(Announcementmanagement announcementmanagement, Model model) {
             Date date = new Date();
@@ -91,7 +91,7 @@ public class AnnouncementController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/newhome/Announcement/";
     }
 
-    @RequiresPermissions("newhome:announcementForm:view")
+
     @RequestMapping(value = "detele")
     public String detele(Announcementmanagement announcementmanagement, Model model) {
             announcementService.deteles(announcementmanagement);

src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -190,7 +190,7 @@ public class SplitAccountService extends BaseService {
 //                    accountPayOrderExt.setInMerchantNo(splitMoneyVo.getName());
                         accountPayOrderExt.setOrderType(AccountPayOrderType.TRANSFER);
 //                    accountPayOrderExt.setAmount(splitMoneyVo.getSplitMoney());
-                        accountPayOrderExt.setServerCallbackUrl(Constant.betaSplit);
+                        accountPayOrderExt.setServerCallbackUrl(Constant.prodSplit);
                         accountPayOrderExt.setGoodsName("分账");
                         if (null != splitBillRules && splitBillRules.size() > 0) {
                             accountPayOrderExt.setSplitBillRules(splitBillRules);
@@ -365,7 +365,7 @@ public class SplitAccountService extends BaseService {
             splitAccount.setSplitAccount(splitAmount);
             splitAccount.setProductType(3);
             splitAccount.setType(5);
-            splitAccount.setSubUserNo(Constant.CUSTOMERNUM);
+            splitAccount.setSubUserNo(Constant.CUSTOMERNUM2);
             logger.info("佣金分账参数------------->" + splitAccount);
             list.add(splitAccount);
         }

src/main/java/com/caimei/modules/product/dao/ProductNewDao.java

@@ -65,4 +65,6 @@ public interface ProductNewDao extends CrudDao<Product> {
     Integer getShopIdByName(String shopName);
 
     List<SplitCode> findSecondSplitCode(String id);
+
+    void addProductData(@Param("productId") Integer productId,@Param("costPrice") String costPrice,@Param("costProportional") String costProportional,@Param("taxPoint") String taxPoint,@Param("supplierTaxPoint") String supplierTaxPoint);
 }

src/main/java/com/caimei/modules/product/service/ProductNewService.java

@@ -369,4 +369,18 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         });
 
     }
+
+    public void addProductData() {
+        List<CmHeheProduct> heheProductList = cmHeheProductDao.findList(new CmHeheProduct());
+        heheProductList.forEach(heheProduct->{
+            Product cmProduct = productNewDao.get(heheProduct.getOldProductId().toString());
+            if (null != cmProduct) {
+                String costPrice = cmProduct.getCostPrice();
+                String costProportional = cmProduct.getCostProportional();
+                String taxPoint = cmProduct.getTaxPoint();
+                String supplierTaxPoint = cmProduct.getSupplierTaxPoint();
+                productNewDao.addProductData(heheProduct.getProductId(), costPrice, costProportional, taxPoint, supplierTaxPoint);
+            }
+        });
+    }
 }

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

@@ -1095,6 +1095,17 @@ public class ProductNewController extends BaseController {
         return "success";
     }
 
+    /**
+     * 补充数据
+     * @return
+     */
+    @RequestMapping("/hehe/data/add")
+    @ResponseBody
+    public String addProductData(){
+        productNewService.addProductData();
+        return "success";
+    }
+
     /**
      * 恢复呵呵商品原来对应的采美商品id
      */

src/main/java/com/caimei/modules/user/web/OperationalLogsController.java

@@ -22,7 +22,6 @@ public class OperationalLogsController extends BaseController {
     private SysLogService sysLogService;
 
 
-    @RequiresPermissions("cm:cmOperationalLogs:view")
     @RequestMapping(value = {""})
     public String list(OperationalLogs operationalLogs, HttpServletRequest request, HttpServletResponse response, Model model) {
 //        List<OperationalLogs> operational = sysLogService.findList(new OperationalLogs());

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -11,6 +11,7 @@
 		a.invoiceType AS "invoiceType",
 		a.clubTaxPoint AS "clubTaxPoint",
 		a.shopTaxPoint AS "shopTaxPoint",
+		a.oldProductId,
 		p.costCheckFlag AS "costType",
 		p.costPrice AS "costPrice",
 		p.costProportional AS "costProportional",

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -732,6 +732,14 @@
             #{addTime}
           )
     </insert>
+    <insert id="addProductData">
+        update product
+        set costPrice        = #{costPrice},
+            costProportional = #{costProportional},
+            taxPoint         = #{taxPoint},
+            supplierTaxPoint = #{supplierTaxPoint}
+        where productID = #{productId}
+    </insert>
 
     <select id="findAllStatusRemarks" resultType="com.caimei.modules.product.entity.ProductStatusRecord">
         SELECT

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -713,9 +713,15 @@
                     <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>
                     <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
                     <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
-                    <c:if test="${order.orderSubmitType != 0 && order.orderType !=0 }">
+                    <c:if test="${order.orderType ==0}" >
                     <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
-                    </c:if>                  <%--包含订单充值商品就不显示--%>
+                </c:if>
+                    <c:if test="${order.orderType !=0}" >
+                        <c:if test="${order.spID!=null}">
+                            <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
+                        </c:if>
+                    </c:if>
+                    <%--包含订单充值商品就不显示--%>
                     <c:if test="${empty order.rechargeGoods}">
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
                             <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>

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

@@ -380,7 +380,7 @@
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>发布者身份：</label>
         <div class="controls">
-            <form:radiobutton path="publishIdentity" value="1" label="个人身份" onchange="Idcheck(1)"/>
+            <form:radiobutton path="publishIdentity" checked="true" value="1" label="个人身份" onchange="Idcheck(1)"/>
             <form:radiobutton path="publishIdentity" value="2" label="公司身份" onchange="Idcheck(2)"/>
         </div>
     </div>
@@ -446,12 +446,12 @@
             <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 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">
@@ -472,30 +472,30 @@
             </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 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">