Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

 Conflicts:

	kmall-admin/src/main/java/com/kmall/admin/service/impl/statistics/MonthlyCustomersServiceImpl.java

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

@@ -61,7 +61,7 @@ public class GoodsController {
     @RequiresPermissions("goods:list")
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeKey", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "name");
+//        ParamUtils.setName(params, "name");
         String lastSaleTime = (String) params.get("lastSaleTime");
         if(org.apache.commons.lang.StringUtils.isNotEmpty(lastSaleTime)) {
             try {

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

@@ -49,7 +49,7 @@ public class ProductStoreRelaController {
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "goodsName");
+//        ParamUtils.setName(params, "goodsName");
         String lastSaleTime = (String) params.get("lastSaleTime");
         if(org.apache.commons.lang.StringUtils.isNotEmpty(lastSaleTime)) {
             try {

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

@@ -98,6 +98,9 @@ public class StoreController {
         builder.put("storeName", "门店名称");
         builder.put("storeNumber", "门店编号");
         builder.put("thirdPartyMerchCode", "第三方商户编号");
+        builder.put("provinceName", "省份");
+        builder.put("cityName", "城市");
+        builder.put("countyName", "区");
 //        builder.put("thirdPartyMerchName", "第三方商户名称");
         builder.put("exprAgreementType", "第三方商户快递协议类型");
         builder.put("latitude", "纬度");

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

@@ -43,7 +43,7 @@ public class ThirdMerchantBizController {
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeKey", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "name");
+//        ParamUtils.setName(params, "name");
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkActivitiesController.java

@@ -101,7 +101,7 @@ public class MkActivitiesController {
         builder.put("mkaStartTime", "开始时间");
         builder.put("mkdEndTime", "结束时间");
         if("1".equals(mkActivities.getMkaEndEarly())){
-            builder.put("mkdEndEarlyTime", "结束时间");
+            builder.put("mkdEndEarlyTime", "提前结束结束时间");
         }
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {

kmall-admin/src/main/java/com/kmall/admin/controller/statistics/MonthlyCustomersController.java

@@ -217,17 +217,34 @@ public class MonthlyCustomersController {
      */
     @RequestMapping("/top10ForProduct")
     public R top10ForProduct(@RequestParam("month") String month, @RequestParam("week") String week){
+        boolean monthFlag = false;
         if (Objects.isNull(month) || "".equals(month)){
-            return R.error("请选择月份");
-        }else if(Objects.isNull(week)  || "".equals(week)){
+            monthFlag = true;
+        }
+
+        if(monthFlag && (Objects.isNull(week)  || "".equals(week))){
             return R.error("请选择周");
+        }else{
+            monthFlag = false;
+            week = week.split("W")[1];
+        }
+
+        if(monthFlag ){
+            return R.error("请选择月份");
+        }
+
+        if(!"".equals(week) && !"".equals(month)){
+            return R.error("只能选择一个时间！");
         }
+
+
         String merchSn = null;
         SysUserEntity sysUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         if(!"1".equals(sysUser.getRoleType())){
             merchSn = sysUser.getMerchSn();
         }
 
+
         Map<String,Object> map = monthlyCustomersService.top10ForProduct(month,week,merchSn);
 
         return R.ok(map);
@@ -370,7 +387,7 @@ public class MonthlyCustomersController {
         Map<String,Object> map = monthlyCustomersService.queryWeeklyCustomers(startWeek,endWeek,merchSn,dateList);
 
         Map<String, Object> returnMap = new HashMap<>();
-        returnMap.put("dateList", dateList);
+//        returnMap.put("dateList", dateList);
         returnMap.putAll(map);
 
 

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

@@ -17,6 +17,7 @@ import java.util.Map;
 public interface StoreDao extends BaseDao<StoreEntity> {
 
     StoreEntity queryObjectByName(@Param("storeName") String storeName);
+    StoreEntity queryObjectByNumber(@Param("storeNumber") String storeNumber);
 
     List<StoreEntity> queryExportList(Map<String, Object> map);
 //    StoreEntity queryObjectByDistId(@Param("distId") Integer distId);

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

@@ -113,6 +113,9 @@ public class GoodsTransportInfoDetailServiceImpl implements GoodsTransportInfoDe
             if (StringUtils.isEmpty(goodsTransportInfoDetailExcelDto.getSku())){
                 throw new RRException("sku必填");
             }
+            if (StringUtils.isEmpty(goodsTransportInfoDetailExcelDto.getOriginCountry())){
+                throw new RRException("原产地必填");
+            }
 
             // 判断sku和供应商id是否存在
             Integer exist = goodsTransportInfoDetailDao.existGoodsBySkuAndsupplierId(goodsTransportInfoDetailExcelDto.getSku(), goodsTransportInfoDetailExcelDto.getSupplierId());

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

@@ -96,6 +96,13 @@ public class MkActivitiesCouponServiceImpl implements MkActivitiesCouponService
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesCouponEntity old = mkActivitiesCouponDao.queryByBarCode(Long.parseLong(mkaId), couponMerchandiseDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+couponMerchandiseDto.getBarCode()+"}",500);
+                }
+
+
                 // 保存日常活动商品
                 MkActivitiesCouponEntity mkActivitiesCouponEntity = new MkActivitiesCouponEntity();
                 mkActivitiesCouponEntity.setCouponSn(couponMerchandiseDto.getCouponSn()); // 商品名称

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

@@ -96,6 +96,12 @@ public class MkActivitiesDiscountServiceImpl implements MkActivitiesDiscountServ
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesDiscountEntity old = mkActivitiesDiscountDao.queryByBarCode(Long.parseLong(mkaId), discountedProductsDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+discountedProductsDto.getBarCode()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesDiscountEntity mkActivitiesDiscountEntity = new MkActivitiesDiscountEntity();
                 mkActivitiesDiscountEntity.setProductName(discountedProductsDto.getGoodsName()); // 商品名称

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

@@ -3,6 +3,7 @@ package com.kmall.admin.service.impl;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.FreeGoodsDto;
 import com.kmall.admin.dto.FullReductionDto;
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
 import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -100,6 +103,14 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                String nowTime = format.format(new Date());
+
+                MkActivitiesFullGiftEntity old =  mkActivitiesFullGiftDao.queryByCodeOrBrand(Long.parseLong(mkaId),freeGoodsDto.getBarCode(),freeGoodsDto.getBrand(),nowTime);
+                if(old != null){
+                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+freeGoodsDto.getBarCode()+"},品牌,{"+freeGoodsDto.getBrand()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesFullGiftEntity mkActivitiesFullGiftEntity = new MkActivitiesFullGiftEntity();
                 mkActivitiesFullGiftEntity.setQualifiedAmount(new BigDecimal(freeGoodsDto.getFullReductionPrice())); // 满赠达到金额

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

@@ -3,6 +3,7 @@ package com.kmall.admin.service.impl;
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.FullReductionDto;
 import com.kmall.admin.dto.TemporaryPromotionalItemsDto;
+import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
 import com.kmall.admin.entity.MkActivitiesPromotionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -99,6 +102,15 @@ public class MkActivitiesFullReductionServiceImpl implements MkActivitiesFullRed
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                String nowTime = format.format(new Date());
+
+                MkActivitiesFullReductionEntity old =  mkActivitiesFullReductionDao.queryByCodeOrBrand(Long.parseLong(mkaId),fullReductionDto.getBarCode(),fullReductionDto.getBrand(),nowTime);
+                if(old != null){
+                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+fullReductionDto.getBarCode()+"},品牌,{"+fullReductionDto.getBrand()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesFullReductionEntity mkActivitiesFullReductionEntity = new MkActivitiesFullReductionEntity();
                 mkActivitiesFullReductionEntity.setQualifiedAmount(new BigDecimal(fullReductionDto.getFullReductionPrice())); // 满减达到金额

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

@@ -98,6 +98,11 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesGetOneFreeGoodsEntity old = mkActivitiesGetOneFreeGoodsDao.queryByCodeOrBrand(Long.parseLong(mkaId), buyOneGetOneFreeDto.getBuyBarCode(), buyOneGetOneFreeDto.getBuyBrand());
+                if(old != null){
+                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+buyOneGetOneFreeDto.getBuyBarCode()+"},品牌,{"+buyOneGetOneFreeDto.getBuyBrand()+"}",500);
+                }
                 // 保存日常活动商品
                 MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoodsEntity = new MkActivitiesGetOneFreeGoodsEntity();
                 mkActivitiesGetOneFreeGoodsEntity.setGoodsSn(buyOneGetOneFreeDto.getBuyGoodsSn()); // 商品编号

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

@@ -2,6 +2,7 @@ package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.TemporaryPromotionalItemsDto;
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.RRException;
@@ -94,6 +95,12 @@ public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionSe
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkActivitiesPromotionEntity old = mkActivitiesPromotionDao.queryByBarCode(Long.parseLong(mkaId), temporaryPromotionalItemsDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+temporaryPromotionalItemsDto.getBarCode()+"}",500);
+                }
+
                 // 保存日常活动商品
                 MkActivitiesPromotionEntity mkActivitiesPromotionEntity = new MkActivitiesPromotionEntity();
                 mkActivitiesPromotionEntity.setProductName(temporaryPromotionalItemsDto.getGoodsName()); // 商品名称

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

@@ -2,6 +2,7 @@ package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.dto.DailyPriceGoodsDto;
+import com.kmall.admin.entity.MkActivitiesPromotionEntity;
 import com.kmall.common.utils.MapBeanUtil;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.RRException;
@@ -98,6 +99,11 @@ public class MkDailyActivitiesServiceImpl implements MkDailyActivitiesService {
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
                 }
+
+                MkDailyActivitiesEntity old = mkDailyActivitiesDao.queryByBarCode(Long.parseLong(mkaId), dailyPriceGoodsDto.getBarCode());
+                if(old != null){
+                    throw new RRException("该商品已经参与本次活动，商品{"+dailyPriceGoodsDto.getBarCode()+"}",500);
+                }
                 // 保存日常活动商品
                 MkDailyActivitiesEntity mkDailyActivitiesEntity = new MkDailyActivitiesEntity();
                 mkDailyActivitiesEntity.setProductName(dailyPriceGoodsDto.getGoodsName()); // 商品名称

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

@@ -1881,6 +1881,12 @@ public class OrderServiceImpl implements OrderService {
 //            wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
             // 支付宝支付
 //            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
+            OrderEntity orderEntity = queryObject(order.getId());
+            orderEntity.setOrderStatus(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
+            orderEntity.setPayStatus(Integer.parseInt(Dict.payStatus.item_2.getItem()));
+//            orderEntity.setPayFlag(payFlag);
+            orderEntity.setPayTime(new Date());
+            orderDao.update(orderEntity);
             resultObj.put("shopName",store.getStoreName()); // 根据门店编号查询
             resultObj.put("userName",user.getUsername());
 

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

@@ -84,6 +84,12 @@ public class StoreServiceImpl implements StoreService {
         if(storeEntity != null){
             throw new RRException("门店名称已存在");
         }
+        storeEntity = null;
+        storeEntity = storeDao.queryObjectByNumber(store.getStoreNumber());
+        if(storeEntity != null){
+            throw new RRException("门店编号已存在");
+        }
+
 //        if(StringUtils.isNotEmpty(String.valueOf(store.getDistId()))) {
 //            StoreEntity storeEntityByDistId = storeDao.queryObjectByDistId(store.getDistId());
 //            if (storeEntityByDistId != null) {

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

@@ -58,6 +58,10 @@
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')
 		</if>
+		<if test="exportDataType != null and exportDataType.trim() != ''">
+			AND export_data_type = #{exportDataType}
+		</if>
+
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -70,21 +74,24 @@
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-	
+
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall_export_exception_data
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
 		<if test="storeId != null and storeId != '' ">
 			AND store_id = #{storeId}
 		</if>
 		<if test="merchSn != null and merchSn.trim() != '' ">
 			AND merch_sn = #{merchSn}
 		</if>
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+		<if test="exportDataType != null and exportDataType.trim() != ''">
+			AND export_data_type = #{exportDataType}
+		</if>
 	</select>
-	 
+
 	<insert id="save" parameterType="com.kmall.admin.entity.ExportExceptionDataEntity" useGeneratedKeys="true" keyProperty="id">
 		insert into mall_export_exception_data(
 			`export_exception_data`,
@@ -109,9 +116,9 @@
 			#{modTime},
 			#{tstm})
 	</insert>
-	 
+
 	<update id="update" parameterType="com.kmall.admin.entity.ExportExceptionDataEntity">
-		update mall_export_exception_data 
+		update mall_export_exception_data
 		<set>
 			<if test="exportExceptionData != null">`export_exception_data` = #{exportExceptionData}, </if>
 			<if test="exportDataType != null">`export_data_type` = #{exportDataType}, </if>
@@ -126,16 +133,16 @@
 		</set>
 		where id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		delete from mall_export_exception_data where id = #{value}
 	</delete>
-	
+
 	<delete id="deleteBatch">
-		delete from mall_export_exception_data where id in 
+		delete from mall_export_exception_data where id in
 		<foreach item="id" collection="array" open="(" separator="," close=")">
 			#{id}
 		</foreach>
 	</delete>
 
-</mapper>
+</mapper>

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

@@ -59,6 +59,9 @@
 		<if test="merchSn != null and merchSn.trim() != '' and storeId != null and storeId.trim() != ''">
 			AND store_id=#{storeId} AND store_id IS NULL AND merch_sn=#{merchSn}
 		</if>
+		<if test="name != null and name.trim() != ''" >
+			AND label_head_name = #{name}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -71,7 +74,7 @@
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-	
+
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall_goods_label_head
 		WHERE 1=1
@@ -82,8 +85,11 @@
 		<if test="merchSn != null and merchSn.trim() != '' and storeId != null and storeId.trim() != ''">
 			AND store_id=#{storeId} AND store_id IS NULL AND merch_sn=#{merchSn}
 		</if>
+		<if test="name != null and name.trim() != ''" >
+			AND label_head_name = #{name}
+		</if>
 	</select>
-	 
+
 	<insert id="save" parameterType="com.kmall.admin.entity.GoodsLabelHeadEntity" useGeneratedKeys="true" keyProperty="id">
 		insert into mall_goods_label_head(
 			`merch_sn`,
@@ -110,9 +116,9 @@
 			#{modTime},
 			#{tstm})
 	</insert>
-	 
+
 	<update id="update" parameterType="com.kmall.admin.entity.GoodsLabelHeadEntity">
-		update mall_goods_label_head 
+		update mall_goods_label_head
 		<set>
 			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
 			<if test="storeId != null">`store_id` = #{storeId}, </if>
@@ -128,16 +134,16 @@
 		</set>
 		where id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		delete from mall_goods_label_head where id = #{value}
 	</delete>
-	
+
 	<delete id="deleteBatch">
-		delete from mall_goods_label_head where id in 
+		delete from mall_goods_label_head where id in
 		<foreach item="id" collection="array" open="(" separator="," close=")">
 			#{id}
 		</foreach>
 	</delete>
 
-</mapper>
+</mapper>

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

@@ -89,7 +89,7 @@
 		<if test="storeId != null and storeId.trim() != ''">
 			AND shop_sn = #{storeId}
 		</if>
-		<if test="mkaId != null'">
+		<if test="mkaId != null">
 			AND mka_id = #{mkaId}
 		</if>
 	</select>

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

@@ -70,6 +70,27 @@
 		where store_name = #{storeName}
 	</select>
 
+	<select id="queryObjectByNumber" resultType="com.kmall.admin.entity.StoreEntity">
+		select
+		`id`,
+		`merch_sn`,
+		`merch_name`,
+		`store_name`,
+		`store_number`,
+		`store_address`,
+		`province_name`,
+		`city_name`,
+		`county_name`,
+		`latitude`,
+		`longitude`,
+		`cover_radius`,expr_agreement_type,
+		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
+    moder_sn, mod_time, tstm,is_valid
+		from mall_store
+		where store_number = #{storeNumber}
+	</select>
+
+
 	<!--<select id="queryObjectByDistId" resultType="com.kmall.admin.entity.StoreEntity">-->
 		<!--select-->
 		<!--`id`,-->

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivityFormDao.xml

@@ -137,7 +137,7 @@
 			AND a2.mk_code LIKE concat('%',#{mkCode},'%')
 		</if>
         <if test="topic != null and topic.trim() != ''">
-            AND mka_topic LIKE concat('%',#{topic},'%')
+            AND a.mka_topic LIKE concat('%',#{topic},'%')
         </if>
 		<choose>
 			<when test="sidx != null and sidx.trim() != ''">

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

@@ -42,7 +42,6 @@
             <input type="month" name="endMonth" id="endMonth" />&nbsp;
             <span>预定月份数</span>
             <input type="number" name="monthNumber" id="monthNumber">;
-            <input type="button" name="queryButton" value="查询" onclick="queryMonthly()" />
             <input type="button" name="queryButton" value="导出选中的数据" onclick="exportSelectedMonthData()" />
             </div>
         </div>

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

@@ -87,4 +87,4 @@
 
 <script src="${rc.contextPath}/js/shop/goodstransportinfodetail.js?_${date.systemTime}"></script>
 </body>
-</html>
+</html>

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

@@ -440,7 +440,7 @@ let vm = new Vue({
         },
         clearGoodsList:function(){
             this.goodsList = [];
-            vm.totalPrice = 0;
+            vm.customClearData();
 
         },
         toOrderSubmit:function(){
@@ -472,29 +472,11 @@ let vm = new Vue({
                             })
                             // 打印取货码小票
                             var content = getPrintContent(r.resultObj);
-                            printArea2(content);
+                            // printArea2(content);
                             vm.goodsList = [];
                             vm.customname = '' ;
                             vm.customidcard = '';
-                            vm.totalPrice = 0;
-                            vm.discountedPrice = 0;
-                            vm.actualPrice = 0;
-                            // 买一送一
-                            vm.mysy = [];
-                            // 组合价
-                            vm.zhjsp = new Map();
-                            vm.combinationPrice = new Map(); // 组合价商品的组合价
-                            // 满减
-                            vm.mj = new Map();
-                            vm.accumulatedAmount = new Map();// 累积金额（满减使用的)
-                            vm.reduceMoney = 0; // 满减金额
-                            vm.showReduceMoney = 0; // 用于展示的满减金额
-                            // 满赠
-                            vm.mz = new Map();
-                            vm.accumulatedAmountForFullGift = new Map(); // 累积金额（满赠使用的)
-                            vm.fullGiftCode = [];// 满赠商品条码
-                            // 优惠券
-                            vm.coupons = new Map();
+                            vm.customClearData();
 
                             // alert('打印小票完成');
                         }else{
@@ -506,6 +488,26 @@ let vm = new Vue({
                 }
             });
 
+        },customClearData: function(){
+            vm.totalPrice = 0;
+            vm.discountedPrice = 0;
+            vm.actualPrice = 0;
+            // 买一送一
+            vm.mysy = [];
+            // 组合价
+            vm.zhjsp = new Map();
+            vm.combinationPrice = new Map(); // 组合价商品的组合价
+            // 满减
+            vm.mj = new Map();
+            vm.accumulatedAmount = new Map();// 累积金额（满减使用的)
+            vm.reduceMoney = 0; // 满减金额
+            vm.showReduceMoney = 0; // 用于展示的满减金额
+            // 满赠
+            vm.mz = new Map();
+            vm.accumulatedAmountForFullGift = new Map(); // 累积金额（满赠使用的)
+            vm.fullGiftCode = [];// 满赠商品条码
+            // 优惠券
+            vm.coupons = new Map();
         },
         getIDCardInfo: function(){
             $.get("../order/getIdCardInfo", function (r){
@@ -530,19 +532,19 @@ let vm = new Vue({
             if(this.$refs.couponSn)
                 this.userInfo.couponSn = this.$refs.couponSn.value;
             var idcardReg = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
-            if(!this.userInfo.customName){
-                alert("姓名不能为空！");
-                return ;
-            }
-            if(!idcardReg.test(this.userInfo.customIDCard)){
-                alert("请输入正确的身份证号");
-                return ;
-            }
-
-            if(!(/^1[3456789]\d{9}$/.test(this.userInfo.customPhone))){
-                alert("手机号码有误，请重填");
-                return ;
-            }
+            // if(!this.userInfo.customName){
+            //     alert("姓名不能为空！");
+            //     return ;
+            // }
+            // if(!idcardReg.test(this.userInfo.customIDCard)){
+            //     alert("请输入正确的身份证号");
+            //     return ;
+            // }
+            //
+            // if(!(/^1[3456789]\d{9}$/.test(this.userInfo.customPhone))){
+            //     alert("手机号码有误，请重填");
+            //     return ;
+            // }
 
             if(this.userInfo.couponSn){
                 var coupon = vm.coupons.get(this.userInfo.couponSn);

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

@@ -39,7 +39,8 @@ function dFun(productNameList,salesList) {
                 name: '2011年',
                 type: 'bar',
                 data: salesList,
-                label:seriesLabel
+                label:seriesLabel,
+                barWidth:30,
             }]
 
     });

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

@@ -179,6 +179,7 @@ function queryWeekly(){
                 alert(data.msg);
                 return;
             }
+            console.log(data);
             dFun(data.dateList, data.totalNumberList, data.totalSalesList);
 
         },
@@ -206,4 +207,4 @@ function exportWeekly(){
     console.log(params);
     exportFile('#rrapp', '../monthly/weeklySalesSummaryExport', params);
 
-}
+}

kmall-admin/src/main/webapp/js/shop/exportexceptiondata.js

@@ -97,13 +97,13 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'exportDataType': vm.q.exportDataType},
                 page: page
             }).trigger("reloadGrid");
-            vm.handleReset('formValidate');
+            // vm.handleReset('formValidate');
 		},
         handleReset: function (name) {
             handleResetForm(this, name);
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -218,6 +218,7 @@ var vm = new Vue({
                 englishName:'',
                 lastSaleTime:''
             }
+            vm.reload();
         },
         query: function () {
             vm.reload(1);

kmall-admin/src/main/webapp/js/shop/goodstransportinfodetail.js

@@ -61,9 +61,9 @@ let vm = new Vue({
 		goodsTransportInfoDetail: {},
         ruleValidate: {
             sku:{required: true, message: 'sku不能为空', trigger: 'blur'},
-            supplierId:{   required: true, message: '供应商id不能为空', trigger: 'blur'},
-            originCountry:{required: true, message: '原产地不能为空', trigger: 'blur'},
-            num:{ required: true, message: '数量不能为空', trigger: 'blur'}
+            // supplierId:{required: true, message: '供应商id不能为空', trigger: 'blur'},
+            // originCountry:{required: true, message: '原产地不能为空', trigger: 'blur'},
+            // num:{required: true, message: '数量不能为空', trigger: 'blur'}
         },
 		q: {
             wayStatus: null,
@@ -162,6 +162,7 @@ let vm = new Vue({
             vm.handleReset('formValidate');
 		},
         handleSubmit: function (name) {
+
             handleSubmitValidate(this, name, function () {
                 vm.saveOrUpdate()
             });
@@ -204,4 +205,4 @@ let vm = new Vue({
             });
         }
 	}
-});
+});