取消商品导入的批量插入

商品查询增加分页条件
中控系统的接口开发
统计报表sql修改
shiro权限接口增加
收银端增加去掉联想的样式

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1074,6 +1074,10 @@ public class OrderController {
                 url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/resendPayment/"+orderSn;
             }else if("notice".equals(resendType)){
                 url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/notice/"+orderSn;
+            }else if("clsOrder".equals(resendType)){
+                url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/clsOrder/"+orderSn;
+            }else if("forceSend".equals(resendType)){
+                url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/forceSend/"+orderSn;
             }
             // 同步访问,返回结果字符串
             response = OkHttpUtils.post(map, url, "SSL");

kmall-admin/src/main/java/com/kmall/admin/controller/kmall2eccs/KtoEccsController.java

@@ -130,10 +130,10 @@ public class KtoEccsController {
      */
     @RequestMapping("/queryAllGoodsInfo")
     @ResponseBody
-    public List<GoodsEntity> queryAllGoodsInfo(){
+    public List<GoodsEntity> queryAllGoodsInfo(@RequestParam("page") Integer page ,@RequestParam("pageSize") Integer pageSize){
 
 
-        List<GoodsEntity> goodsEntities = goodsService.queryAllList();
+        List<GoodsEntity> goodsEntities = goodsService.queryAllList(page,pageSize);
 
         return  goodsEntities;
     }
@@ -143,10 +143,10 @@ public class KtoEccsController {
      */
     @RequestMapping("/queryAllStoreProductInfo")
     @ResponseBody
-    public List<ProductStoreRelaEntity> queryAllStoreProductInfo(){
+    public List<ProductStoreRelaEntity> queryAllStoreProductInfo(@RequestParam("page") Integer page ,@RequestParam("pageSize") Integer pageSize){
 
 
-        List<ProductStoreRelaEntity> productStoreRelaEntities = productStoreRelaService.queryAllList();
+        List<ProductStoreRelaEntity> productStoreRelaEntities = productStoreRelaService.queryAllList(page,pageSize);
 
         return  productStoreRelaEntities;
     }

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsDao.java

@@ -3,7 +3,6 @@ package com.kmall.admin.dao;
 import com.kmall.admin.dto.GoodsDetailsDto;
 import com.kmall.admin.dto.GoodsPanoramaDto;
 import com.kmall.admin.entity.GoodsEntity;
-import com.kmall.admin.entity.TaxErrorRecordEntity;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
@@ -72,7 +71,7 @@ public interface GoodsDao extends BaseDao<GoodsEntity> {
 
     List<GoodsEntity> queryNonSyncOmsGoodsRateSkuList();
 
-    List<GoodsEntity> queryAllList();
+    List<GoodsEntity> queryAllList(@Param("page") Integer page, @Param("pageSize") Integer pageSize);
 
     GoodsEntity queryByBarcodeAndSku(@Param("prodBarcode") String prodBarcode, @Param("goodsSn") String goodsSn);
 

kmall-admin/src/main/java/com/kmall/admin/dao/ProductStoreRelaDao.java

@@ -86,5 +86,5 @@ public interface ProductStoreRelaDao extends BaseDao<ProductStoreRelaEntity> {
 
     void updatePriceBySku(@Param("updatePrice") String updatePrice, @Param("sku") String sku);
 
-    List<ProductStoreRelaEntity> queryAllList();
+    List<ProductStoreRelaEntity> queryAllList(@Param("page") Integer page, @Param("pageSize") Integer pageSize);
 }

kmall-admin/src/main/java/com/kmall/admin/service/GoodsService.java

@@ -208,6 +208,6 @@ public interface GoodsService {
 
     void checkGoodsPrice(SysUserEntity user);
 
-    List<GoodsEntity> queryAllList();
+    List<GoodsEntity> queryAllList(Integer page,Integer pageSize);
 
 }

kmall-admin/src/main/java/com/kmall/admin/service/ProductStoreRelaService.java

@@ -144,6 +144,8 @@ public interface ProductStoreRelaService {
     /**
      * 查询所有门店数据
      * @return
+     * @param page
+     * @param pageSize
      */
-    List<ProductStoreRelaEntity> queryAllList();
+    List<ProductStoreRelaEntity> queryAllList(Integer page, Integer pageSize);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.gson.Gson;
 import com.kmall.admin.dao.*;
 import com.kmall.admin.dto.GoodsDetailsDto;
 import com.kmall.admin.dto.GoodsDto;
@@ -1016,8 +1015,8 @@ public class GoodsServiceImpl implements GoodsService {
                         goodsEntity.setGoodsNumber(goods.getGoodsNumber()+Integer.parseInt(goodsDto.getGoodsNumber()));
 
                         // TODO 这里改成批量修改 GoodsEntity
-                        updateGoodsList.add(goodsEntity);
-//                        goodsDao.update(goodsEntity);
+//                        updateGoodsList.add(goodsEntity);
+                        goodsDao.update(goodsEntity);
                     }else{
                         mngChangeEntity.setOriginalNum(0);//原库存数
                         mngChangeEntity.setValidNum(Integer.parseInt(goodsDto.getGoodsNumber()));//可用数
@@ -1159,16 +1158,16 @@ public class GoodsServiceImpl implements GoodsService {
                     goodsSpecificationDao.updateBatch(updateSpecificationList);
                 }
             }
-            if(updateGoodsList != null && updateGoodsList.size() > 0 ){
-                if(updateGoodsList.size() > 50){
-                    List<List<GoodsEntity>> partition = Lists.partition(updateGoodsList, 50);
-                    for (List<GoodsEntity> goodsEntities : partition) {
-                        goodsDao.updateBatch(goodsEntities);
-                    }
-                }else{
-                    goodsDao.updateBatch(updateGoodsList);
-                }
-            }
+//            if(updateGoodsList != null && updateGoodsList.size() > 0 ){
+//                if(updateGoodsList.size() > 50){
+//                    List<List<GoodsEntity>> partition = Lists.partition(updateGoodsList, 50);
+//                    for (List<GoodsEntity> goodsEntities : partition) {
+//                        goodsDao.updateBatch(goodsEntities);
+//                    }
+//                }else{
+//                    goodsDao.updateBatch(updateGoodsList);
+//                }
+//            }
 
 
 
@@ -2022,7 +2021,7 @@ public class GoodsServiceImpl implements GoodsService {
     public void syncGoodsRate() {
         String storeId = "163"; // 市场部说所有门店价格一致，并且活动一致，可直接取其中一个门店价格进行计算税率
         // 查询出所有商品
-        List<GoodsEntity> allGoodsList = goodsDao.queryAllList();
+        List<GoodsEntity> allGoodsList = goodsDao.queryAllList(null,null);
         for (GoodsEntity goodsEntity : allGoodsList) {
             // 同步过海关商品编码才可以算税率
             if ("1".equals(goodsEntity.getIsSyncHsCode())) {
@@ -2086,8 +2085,8 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
     @Override
-    public List<GoodsEntity> queryAllList() {
-        return goodsDao.queryAllList();
+    public List<GoodsEntity> queryAllList(Integer page,Integer pageSize) {
+        return goodsDao.queryAllList(page,pageSize);
     }
 
     private void calculeatePromotion(SysUserEntity user, GoodsEntity goods, List<Map<String, String>> errorPriceSkuList, List<ShopErrorPriceRecordEntity> shopErrorPriceRecordEntities) {

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -758,7 +758,11 @@ public class OrderServiceImpl implements OrderService {
             ktoEccsEntity.setRequestData(JSON.toJSONString(orderGoodsEntity));
             ktoEccsEntity.setRequestType("04");
             ktoEccsEntity.setSendStatus("00");
-            ktoEccsEntity.setCreaterSn(user.getUserId()+"");
+            if(user != null){
+                ktoEccsEntity.setCreaterSn(user.getUserId()+"");
+            }else{
+                ktoEccsEntity.setCreaterSn("9999");
+            }
             ktoEccsEntity.setCreateTime(new Date());
             ktoEccsEntities.add(ktoEccsEntity);
         }

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -17,13 +17,11 @@ import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.api.util.StockUtil;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.*;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -853,10 +851,12 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
      * 查询所有门店数据
      *
      * @return
+     * @param page
+     * @param pageSize
      */
     @Override
-    public List<ProductStoreRelaEntity> queryAllList() {
-        return productStoreRelaDao.queryAllList();
+    public List<ProductStoreRelaEntity> queryAllList(Integer page, Integer pageSize) {
+        return productStoreRelaDao.queryAllList(page,pageSize);
     }
 
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/RealtimeSalesDetectionServiceImpl.java

@@ -30,7 +30,7 @@ public class RealtimeSalesDetectionServiceImpl implements RealtimeSalesDetection
                 //计算毛利 实际销售额-总成本
                 r.setGrossProfit(r.getActualSales().subtract(r.getTotalCost()));
                 //计算毛利率 总成本/实际销售额
-                r.setGrossProfitRatio(r.getTotalCost().divide(r.getActualSales()));
+                r.setGrossProfitRatio(r.getTotalCost().divide(r.getActualSales(), 2, BigDecimal.ROUND_HALF_UP));
             }
             //计算客单价
             r.setGuestUnitPrice(r.getActualSales().divide(new BigDecimal(r.getGuestNumber()),2));

kmall-admin/src/main/java/com/kmall/admin/service/impl/compared/OrderComparedErrorServiceImpl.java

@@ -109,10 +109,10 @@ public class OrderComparedErrorServiceImpl implements OrderComparedErrorService
                 return "暂无需要对比的订单";
             }
 
-            // 对比中网的订单数据
-            comparedKmallOrder(payOrderInfoEntities,comparedDate);
             // 对比oms的订单数据
             comparedOmsOrder(payOrderInfoEntities,comparedDate);
+            // 对比中网的订单数据
+            comparedKmallOrder(payOrderInfoEntities,comparedDate);
 
             // 批量修改支付单对比状态跟对比时间
             payOrderInfoService.updateBatch(payOrderInfoEntities);

kmall-admin/src/main/java/com/kmall/admin/task/SendToEccsTask.java

@@ -18,9 +18,9 @@ import org.springframework.stereotype.Component;
  */
 
 
-@Component("sendToEccsTask")
-@EnableScheduling
-@EnableAsync
+//@Component("sendToEccsTask")
+//@EnableScheduling
+//@EnableAsync
 public class SendToEccsTask {
 
 

kmall-admin/src/main/java/com/kmall/admin/websocket/WebSocketServer.java

@@ -139,7 +139,7 @@ public class WebSocketServer {
     public static void sendMessage(Session session, String message,String picNo) {
         try {
 //            List<PickUpCodeEntity> pickUpCodeEntities = new ArrayList<>();
-            logger.info(picNo);
+//            logger.info(picNo);
 //            if(picNo != null){
 //                pickUpCodeEntities = pickUpCodeMap.get(picNo);
 //            }

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -590,7 +590,7 @@
 			#{legalUnit1Qty},
 			#{legalUnit2Qty},
 			#{cosmThresholdValue},
-			#{toBeRestored},
+			0,
 			#{tstm})
     </insert>
 
@@ -827,6 +827,9 @@
     </select>
     <select id="queryAllList" resultType="com.kmall.admin.entity.GoodsEntity">
         select * from mall_goods
+        <if test="page != null and pageSize != null">
+            limit #{page}, #{pageSize}
+        </if>
     </select>
 
     <select id="queryByBarcodeAndSku" resultType="com.kmall.admin.entity.GoodsEntity">

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -1656,8 +1656,8 @@
             o.merch_sn AS merchSn,
             m.merch_name AS merchName,
             count( distinct o.order_sn ) AS guestNumber,
-            sum(  og.actual_payment_amount/ (1+og.goods_rate) ) + sum(og.discounted_price)AS totalSales,
-            sum(  og.actual_payment_amount/ (1+og.goods_rate) ) + sum(og.discounted_price) AS actualSales,
+            sum( og.actual_payment_amount) + sum(og.discounted_price)AS totalSales,
+            sum( og.actual_payment_amount) - sum(og.tax_price) + sum(og.discounted_price) AS actualSales,
             s.store_name AS storeName,
             max( o.add_time ) AS lastSalesTime ,
             sum( g.cost_price) AS totalCost

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -444,9 +444,7 @@
         <if test="bottomLinePrice != null" >
             bottom_line_price,
         </if>
-        <if test="toBeRestored != null">
             to_be_restored
-        </if>
         )
 		values(
             #{storeId},
@@ -505,9 +503,7 @@
         <if test="bottomLinePrice != null" >
             #{bottomLinePrice,jdbcType=VARCHAR},
         </if>
-        <if test="toBeRestored != null" >
-            #{toBeRestored,jdbcType=VARCHAR}
-        </if>
+        0
         )
 	</insert>
 
@@ -573,7 +569,9 @@
             <if test="lastSaleTime != null" >
                 last_sale_time = #{lastSaleTime,jdbcType=TIMESTAMP},
             </if>
-            0
+            <if test="toBeRestored != null" >
+                to_be_restored = #{toBeRestored,jdbcType=VARCHAR}
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -872,6 +870,9 @@
 
     <select id="queryAllList" resultType="com.kmall.admin.entity.ProductStoreRelaEntity">
         select * from mall_product_store_rela
+        <if test="page != null and pageSize != null">
+            limit #{page} , #{pageSize}
+        </if>
     </select>
 
 </mapper>

kmall-admin/src/main/resources/mybatis/mapper/statistics/MonthlyCustomersDao.xml

@@ -134,10 +134,10 @@
 			AND o.order_biz_type = '10'
 			AND o.pay_status = '2'
 			<if test="startDate != null and startDate.trim() != ''">
-				and DATE_FORMAT(o.pay_time,'%Y-%m')  &gt;= #{startDate}
+				and DATE_FORMAT(o.pay_time,'%Y-%m-%d')  &gt;= #{startDate}
 			</if>
 			<if test="endDate != null and endDate.trim() != ''">
-				and DATE_FORMAT(o.pay_time,'%Y-%m') &lt;= #{endDate}
+				and DATE_FORMAT(o.pay_time,'%Y-%m-%d') &lt;= #{endDate}
 			</if>
 			<if test="merchSn != null">
 				and m.merch_sn = #{merchSn}

kmall-admin/src/main/resources/spring/spring-shiro.xml

@@ -78,6 +78,9 @@
                 /captcha.jpg=anon
                 /low-mp-ver.html=anon
                 /pcd/hbk6zzez.html=anon
+                /ktoeccs/queryAllGoodsInfo=anon
+                /ktoeccs/queryAllStoreProductInfo=anon
+                /ktoeccs/sendToEccs=anon
                 /ws/server/**=anon
                 /restored/toBeRestored/**=anon
                 /**=authc

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -199,15 +199,15 @@
                                         <form>
                                             <div class="form-group">
                                                 <label for="customPhone" class="control-label">手机号:</label>
-                                                <input type="text" class="form-control" ref="customPhone" id="customPhone" @blur="customPhoneBlur" />
+                                                <input autocomplete="off" type="text" class="form-control" ref="customPhone" id="customPhone" @blur="customPhoneBlur" />
                                             </div>
                                             <div class="form-group">
                                                 <label for="customName" class="control-label">姓名:</label>
-                                                <input type="text" class="form-control"  ref="customName"  id="customName" />
+                                                <input autocomplete="off" type="text" class="form-control"  ref="customName"  id="customName" />
                                             </div>
                                             <div class="form-group">
                                                 <label for="customIDCard" class="control-label">身份证:</label>
-                                                <input type="text" class="form-control"  ref="customIDCard"  id="customIDCard" />
+                                                <input autocomplete="off" type="text" class="form-control"  ref="customIDCard"  id="customIDCard" />
                                             </div>
                                             <div v-if="coupons.size > 0" class="form-group">
                                                 <label for="couponSn" class="control-label">优惠券码:</label>
@@ -253,7 +253,7 @@
 
             </div>
             <div class="col-md-3">
-                <h2 class="text-center" style="border: white;background-color: #F5DCB3;padding: 8px" >取货码 <span v-show="delayResponse"> 卡回执！！！！！</span></h2><br/>
+                <h2 class="text-center" style="border: white;background-color: #F5DCB3;padding: 8px" >取货码 <span v-show="delayResponse"> 海关卡回执导致单量堆积</span></h2><br/>
                 <div class="row" style="border: white;background-color: #f0f0f0;overflow:auto;height: 700px;">
                     <div class="col-xs-4 col-sm-4" v-for="(item,i) in pickUpCodeList" style="margin-bottom: 8px;">
                         <i-button data-toggle="modal" data-target="#orderDetail" style="width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn,item.pickUpCodeSn)" v-if="item.pickUpCodeStatus == 0"  >&nbsp;{{item.pickUpCodeSn}}</i-button>
@@ -347,16 +347,17 @@
                                 </tr>
                             </table>
 
-                        </div>e y
+                        </div>
                         <div class="modal-footer">
                             <button v-if="canRefund" type="button" style="margin:0 30px 0 20px;font-size: 20px;float: left" class="btn ivu-btn-error" @click="refundOrder()" id="refundOrder" data-dismiss="modal">退款</button>
-                            <button v-else disabled type="button" style="margin:0 30px 0 20px;font-size: 20px;float: left" class="btn ivu-btn-error" @click="refundOrder()"  data-dismiss="modal">退款</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 30px;" class="btn btn-warning" @click="confirmDelivery" id="confirmDelivery" data-dismiss="modal">确定提货</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 30px;" class="btn btn-primary" @click="resendNotice" id="resendNotice" data-dismiss="modal">重发通知</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 30px;" class="btn btn-primary" @click="resendWaybill" id="resendWaybill" data-dismiss="modal">重发运单</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 30px;" class="btn btn-primary" @click="resendPayment" id="resendPayment" data-dismiss="modal">重发支付单</button>
-                            <button type="button" style="margin:0 30px 0 20px;font-size: 30px;" class="btn btn-primary" @click="verification" id="verification" data-dismiss="modal">核销</button>
-                            <!--<button type="button" class="btn btn-primary" @click="retrySendOrder" id="retrySendOrder" data-dismiss="modal">订单重推</button>-->
+                            <button v-else disabled type="button" style="margin:0 30px 0 25px;font-size: 20px;float: left" class="btn ivu-btn-error" @click="refundOrder()"  data-dismiss="modal">退款</button>
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-warning" @click="confirmDelivery" id="confirmDelivery" data-dismiss="modal">确定提货</button>
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendNotice" id="resendNotice" data-dismiss="modal">重发通知</button>
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendWaybill" id="resendWaybill" data-dismiss="modal">重发运单</button>
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendPayment" id="resendPayment" data-dismiss="modal">重发支付单</button>
+<!--                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="resendOrder" id="resendOrder" data-dismiss="modal">重发订单</button>-->
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="forceSendToOms" id="forceSendToOms" data-dismiss="modal">强推清关</button>
+                            <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="verification" id="verification" data-dismiss="modal">核销</button>
                         </div>
                     </div>
                 </div><!-- /.modal -->

kmall-admin/src/main/webapp/js/sale/realtimeSalesDetection.js

@@ -29,7 +29,7 @@ $(function () {
             {label: '商户名称', name: 'merchName', index: 'storeName', width: 120},
             {label: '销售总额', name: 'totalSales', index: 'totalSales', align: 'right', width: 80},
             {label: '实际销售额（税前）', name: 'actualSales', index: 'actualSales', align: 'right', width: 80},
-            {label: '占比 %', name: 'proportion', index: 'proportion', align: 'right', width: 60},
+            // {label: '占比 %', name: 'proportion', index: 'proportion', align: 'right', width: 60},
             {label: '优惠损失', name: 'preferentialLoss', index: 'preferentialLoss', align: 'right', width: 80},
             {label: '成本总额', name: 'totalCost', index: 'totalCost', align: 'right', width: 80},
             {label: '毛利', name: 'grossProfit', index: 'grossProfit', align: 'right', width: 80},
@@ -58,7 +58,7 @@ $(function () {
         autowidth: true,
         shrinkToFit: false,
         autoScroll: true,   //开启水平滚动条
-        width: 1500,
+        width: 1800,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1054,6 +1054,20 @@ let vm = new Vue({
                 });
             })
         },
+        resendOrder:function(){
+            confirm('确认重发电子订单吗？', function () {
+                $.get("../order/resendOrderToCCNET/"+vm.orderEntity.orderSn+"/clsOrder", function (r) {
+                    alert(r.msg);
+                });
+            })
+        },
+        forceSendToOms:function(){
+            confirm('确认强制推送清关吗？', function () {
+                $.get("../order/resendOrderToCCNET/"+vm.orderEntity.orderSn+"/forceSend", function (r) {
+                    alert(r.msg);
+                });
+            })
+        },
         verification:function(){
 
             if(vm.orderProcessRecord.isCustomsSend != 1){
@@ -1262,7 +1276,7 @@ function openWebSocket() {
             vm.pickUpCodeList = [];
             if(data.pickUpCodeList.length > 0){
                 for(var i = 0 ; i < data.pickUpCodeList.length ; i++){
-                    console.log(data.pickUpCodeList[i].storeId);
+                    // console.log(data.pickUpCodeList[i].storeId);
                     if(data.pickUpCodeList[i].storeId === storeId){
                         vm.pickUpCodeList.push(data.pickUpCodeList[i]);
                     }