提交代码解决冲突

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 通知Service实现类
@@ -38,6 +39,8 @@ public class SysNoticeServiceImpl implements SysNoticeService {
 
     @Override
     public int save(SysNoticeEntity sysNotice) {
+
+        sysNotice.setId(UUID.randomUUID().toString().replaceAll("-",""));
         return sysNoticeDao.save(sysNotice);
     }
 

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/Mk2GoodsTopicPriceServiceImpl.java

@@ -122,12 +122,7 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                 if(storeTopicEntity == null){
                     String merchSn = storeTopicGoodsDto.getMerchSn();
                     List<ThirdMerchantBizEntity> byMerchSn = thirdMerchantBizDao.findByMerchSn(merchSn);
-                    if(byMerchSn != null && byMerchSn.size() > 0){
-                        ThirdMerchantBizEntity thirdMerchantBizEntity = byMerchSn.get(0);
-                        storeTopicEntity.setThirdMerchSn(thirdMerchantBizEntity.getThirdMerchSn());
-                    }else{
-                        throw new RuntimeException("没有该第三方商户");
-                    }
+
                     storeTopicEntity = new StoreTopicEntity();
                     storeTopicEntity.setTitle(storeTopicGoodsDto.getTopic()); // 主题
                     storeTopicEntity.setContent(storeTopicGoodsDto.getTopicContent()); // 内容
@@ -136,6 +131,12 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                     storeTopicEntity.setPromTypeName("每周活动");
                     storeTopicEntity.setStoreId(Integer.parseInt(storeTopicGoodsDto.getShopSn()));
                     storeTopicEntity.setIsValid("0");
+                    if(byMerchSn != null && byMerchSn.size() > 0){
+                        ThirdMerchantBizEntity thirdMerchantBizEntity = byMerchSn.get(0);
+                        storeTopicEntity.setThirdMerchSn(thirdMerchantBizEntity.getThirdMerchSn());
+                    }else{
+                        throw new RuntimeException("没有该第三方商户");
+                    }
                     storeTopicDao.save(storeTopicEntity);
 
                 }

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

@@ -8,7 +8,10 @@ import com.kmall.admin.websocket.WebSocketServer;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -35,19 +38,15 @@ public class TestTask {
 
     @Autowired
     private SysUserService sysUserService;
-    @Autowired
-    private static PickUpCodeService pickUpCodeService;
 
 
 
-    @Scheduled(cron = "0/5 * * * * ?")
+//    @Scheduled(cron = "0/5 * * * * ?")
     public void flushPickUpCode() {
         logger.info("flushPickUpCode-----------------" );
 
 
         WebSocketServer.broadcastInfo("broadcast");
-//        SysUserEntity user = sysUserService.queryObject(1L);
-//        System.out.println(ToStringBuilder.reflectionToString(user));
 
     }
 
@@ -55,4 +54,6 @@ public class TestTask {
     public void test2() {
         logger.info("我是不带参数的test2方法，正在被执行");
     }
+
+
 }

kmall-admin/src/main/webapp/js/alarm/mall2orderingearlywarningreminds.js

@@ -10,7 +10,7 @@ $(function () {
             {label: '平均销量', name: 'averageSales', index: 'average_sales',align:"right", width: 120},
 			{label: '总库存数', name: 'totalNum', index: 'total_num',align:"right", width: 120},
 			{
-				label: '预警时间', name: 'alarmTime', index: 'alarm_time',align:"center", width: 80, formatter: function (value) {
+				label: '预警时间', name: 'alarmTime', index: 'alarm_time',align:"center", width: 200, formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}
 			}

kmall-admin/src/main/webapp/js/alarm/mall2shippingreminderalarm.js

@@ -17,7 +17,7 @@ $(function () {
 
 				}},
 			{
-				label: '预警时间', name: 'alarmTime', index: 'alarm_time',align:"center", width: 80, formatter: function (value) {
+				label: '预警时间', name: 'alarmTime', index: 'alarm_time',align:"center", width: 200, formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}
 			}

kmall-admin/src/main/webapp/statics/plugins/treegrid/jquery.treegrid.extension.js

@@ -256,4 +256,4 @@
         expanderCollapsedClass: 'glyphicon glyphicon-chevron-right'// 缩起的按钮的图标
 
     };
-})(jQuery);
+})(jQuery);

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -820,11 +820,11 @@ public class ApiOrderService {
             mkStoreTicketDiscountVo = apiMkStoreTicketDiscountMapper.queryObject(tickDiscId);
             if(mkStoreTicketDiscountVo != null) {
                 if (mkStoreTicketDiscountVo.getTickDiscType().equalsIgnoreCase(Dict.tickDiscType.item_00.getItem())) {
-                    cond = mkStoreTicketDiscountVo.getVoucherCond();
-                    money = mkStoreTicketDiscountVo.getVoucherMoney();
+                    cond = mkStoreTicketDiscountVo.getVoucherCond(); // 代金券使用条件(元)，消费金额满多少使用
+                    money = mkStoreTicketDiscountVo.getVoucherMoney(); // 优惠多少钱
                 }
                 if (mkStoreTicketDiscountVo.getTickDiscType().equalsIgnoreCase(Dict.tickDiscType.item_01.getItem())) {
-                    cond = mkStoreTicketDiscountVo.getDiscCond();
+                    cond = mkStoreTicketDiscountVo.getDiscCond(); // 折扣券使用条件(元)，)，消费金额满多少使用
                     money = mkStoreTicketDiscountVo.getDiscRatio();//满多少打几折
                 }
                 // TODO: 2019/5/21 代金券暂时无用

kmall-manager/src/main/java/com/kmall/manager/manager/redis/JedisProperties.java

@@ -14,6 +14,15 @@ public class JedisProperties implements Serializable {
     private String host;
     private String port;
     private Pool pool;
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
     public String getKeyPrefix() {
         return keyPrefix;

kmall-manager/src/main/resources/conf/redis.properties

@@ -17,6 +17,7 @@ redis.dev.pool.testOnBorrow=true
 redis.prod.keyPrefix=platform
 redis.prod.host=183.62.225.124
 redis.prod.port=6379
+redis.prod.password=Abc-123#*.-
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000

kmall-manager/src/main/resources/spring/spring-redis.xml

@@ -5,7 +5,7 @@
        xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:tx="http://www.springframework.org/schema/tx"
        xsi:schemaLocation="
-        http://www.springframework.org/schema/beans 
+        http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context-4.2.xsd
@@ -21,6 +21,7 @@
         <property name="keyPrefix" value="${redis.prod.keyPrefix}"/>
         <property name="host" value="${redis.prod.host}"/>
         <property name="port" value="${redis.prod.port}"/>
+        <property name="password" value="${redis.prod.password}"/>
         <property name="pool">
             <bean class="com.kmall.manager.manager.redis.JedisProperties$Pool">
                 <property name="maxIdle" value="${redis.prod.pool.maxIdle}"/>
@@ -46,4 +47,4 @@
     </bean>
 
 
-</beans>
+</beans>