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

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

@@ -2,6 +2,8 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.HaiKongResendMsgEntity;
 
+import java.util.List;
+
 public interface HaiKongResendMsgDao {
 
     /**
@@ -9,4 +11,16 @@ public interface HaiKongResendMsgDao {
      * @param haiKongResendMsgEntity
      */
     public void saveResendMsg(HaiKongResendMsgEntity haiKongResendMsgEntity);
+
+    /**
+     * 获取需要重推的数据
+     * @return
+     */
+    List<HaiKongResendMsgEntity> queryResendMsg();
+
+    /**
+     * 修改重推信息
+     * @param haiKongResendMsgEntity
+     */
+    void updateResendMsg(HaiKongResendMsgEntity haiKongResendMsgEntity);
 }

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

@@ -251,4 +251,9 @@ public interface OrderService {
      * @return
      */
     R resendWayHkBill(String orderSn) throws Exception;
+
+    /**
+     * 重推退款积分，最多五次
+     */
+    void integralTask();
 }

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

@@ -62,7 +62,7 @@ public class BrandServiceImpl implements BrandService {
 
         // 品牌唯一标识符正则校验
         String uniqueIdentifier = brand.getUniqueIdentifier();
-        String regex = "(^[0-9a-zA-Z_&]{1,10}$)";
+        String regex = "(^[0-9a-zA-Z_&-]{1,20}$)";
         if (StringUtils.isNotBlank(uniqueIdentifier)) {
             if (!Pattern.matches(regex, uniqueIdentifier)) {
                 throw new RuntimeException("请输入正确的品牌唯一简码,有问题的简码：" + uniqueIdentifier);
@@ -94,7 +94,7 @@ public class BrandServiceImpl implements BrandService {
 
         // 品牌唯一标识符正则校验
         String uniqueIdentifier = brand.getUniqueIdentifier();
-        String regex = "(^[0-9a-zA-Z_&]{1,10}$)";
+        String regex = "(^[0-9a-zA-Z_&-]{1,20}$)";
         if (StringUtils.isNotBlank(uniqueIdentifier)) {
             if (!Pattern.matches(regex, uniqueIdentifier)) {
                 throw new RuntimeException("请输入正确的品牌唯一简码,有问题的简码：" + uniqueIdentifier);

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

@@ -3604,6 +3604,7 @@ public class OrderServiceImpl implements OrderService {
                 haiKongResendMsgEntity.setInterfaceType(HaiKongMemberSystemUrlEnum.ROLLBACK_MEMBER_SCORE.getUrl());
                 haiKongResendMsgEntity.setRequestMsg(JSON.toJSONString(integralGoBackEntity));
                 haiKongResendMsgEntity.setResponseMsg(responseMsg);
+                haiKongResendMsgEntity.setResendNum(0);
                 haiKongResendMsgEntity.setIsValid(1);
                 haiKongResendMsgDao.saveResendMsg(haiKongResendMsgEntity);
             }
@@ -5248,4 +5249,44 @@ public class OrderServiceImpl implements OrderService {
         }
         return R.ok();
     }
+
+    /**
+     *
+     * 重推退款积分，最多五次
+     */
+    @Override
+    public void integralTask() {
+        //获取重推积分数据
+        List<HaiKongResendMsgEntity> haiKongResendMsgEntities = haiKongResendMsgDao.queryResendMsg();
+        try {
+            if(haiKongResendMsgEntities.size()>0){
+                for(HaiKongResendMsgEntity haiKongResendMsg:haiKongResendMsgEntities) {
+                    Date date = new Date();
+                    String integralGoBackEntityMsg = haiKongResendMsg.getRequestMsg();
+                    String responseMsg = haiKongMemberTemplate.rollbackMemberScore(integralGoBackEntityMsg);
+                    Map<String, Object> res = JSON.parseObject(responseMsg, Map.class);
+                    LOGGER.info("=======> [integralTask-----重推退款积分]" + responseMsg);
+
+                    //解析数据
+                    if ("true".equals(res.get("success").toString())) {
+                        LOGGER.info("=======> [integralTask-----重推退款积分]" + responseMsg);
+                    } else {
+                        LOGGER.error("=======> [integralTask-----重推退款积分]" + responseMsg);
+                        HaiKongResendMsgEntity haiKongResendMsgEntity = new HaiKongResendMsgEntity();
+                        haiKongResendMsgEntity.setResponseMsg(responseMsg);
+                        haiKongResendMsgEntity.setResendNum(haiKongResendMsg.getResendNum()+1);
+                        haiKongResendMsgEntity.setResendTime(date);
+                        haiKongResendMsgEntity.setId(haiKongResendMsg.getId());
+                        haiKongResendMsgDao.updateResendMsg(haiKongResendMsgEntity);
+                    }
+
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.info("重推退款积分-----integralTask",e);
+        }
+
+    }
 }

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

@@ -0,0 +1,25 @@
+package com.kmall.admin.task;
+
+
+import com.kmall.admin.service.OrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 积分回退重推定时任务,重推退款积分，最多五次
+ */
+@Component
+public class IntegralComeBackTask {
+
+    @Autowired
+    private OrderService orderService;
+
+
+
+//    @Scheduled(fixedDelay = 5000L)
+//    public void task() {
+//        orderService.integralTask();
+//    }
+}

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

@@ -1,21 +1,12 @@
 package com.kmall.admin.task;
 
-import com.kmall.admin.fromcomm.service.SysUserService;
 import com.kmall.admin.service.alarm.Mall2OrderingEarlyWarningRemindsService;
-import com.kmall.admin.websocket.WebSocketServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-/**
- * 订货提醒定时器
- * @author Scott
- * @email
- * @date 2016年11月30日 下午1:34:24
- */
+
 @Component("orderRemindsTask")
 public class OrderRemindsTask {
     private Logger logger = LoggerFactory.getLogger(getClass());

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

@@ -11,6 +11,7 @@
 			interface_type,
 			request_msg,
 			response_msg,
+			resend_num,
 			resend_time,
 			is_valid
 		)
@@ -21,10 +22,24 @@
 			#{interfaceType},
 			#{requestMsg},
 			#{responseMsg},
+			#{resendNum},
 			sysdate(),
 			#{isValid}
 		)
 	</insert>
+
+	<select id="queryResendMsg" resultType="com.kmall.admin.entity.HaiKongResendMsgEntity">
+		select id,request_msg as requestMsg,resend_num as resendNum from haikong_resend_msg where resend_num&lt;5 limit 20
+	</select>
+
+	<update id="updateResendMsg"  parameterType="com.kmall.admin.entity.HaiKongResendMsgEntity">
+       update haikong_resend_msg
+              set
+				  response_msg=#{responseMsg},
+				  resend_num=#{resendNum},
+				  last_resend_time=#{lastResendTime}
+              where id=#{id}
+	</update>
 	 
 
 

kmall-admin/src/main/webapp/js/cashier/salerecord.js

@@ -10,8 +10,7 @@ $(function () {
 			{label: '店员名称', name: 'sallerName', index: 'sallerName',align: 'center', width: 120},
 			{label: '门店名称', name: 'storeName', index: 'storeName',align: 'center', width: 120},
 			{label: '活动id', name: 'discountId', index: 'discount_id', align: 'center', width: 120,formatter:function(value){
-				console.log(typeof value);
-				if(value === '0'){
+				if(value === '0' || value == null){
 					return '-';
 				}
 				return value;

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

@@ -1539,7 +1539,7 @@ function getPrintContentOrder(ticket, callback) {
     var content = "<div style=\"width: 270px;font-family: 微软雅黑;font-size: 8px;\">";
     // 打印ogo
     content += "<div style=\"text-align: center;width: 100%;height: 260px;\">";
-    content += "<img src='/statics/img/cw_logo2.png' style='width: 100%;height: 100%;' />";
+    content += "<img src='/statics/img/zmhk.png' style='width: 100%;height: 100%;' />";
     content += "</div>";
     //小票头
     content += "<div style=\"text-align: center;width: 100%;font-weight:bold;font-size: 13px;\">";
@@ -1689,7 +1689,7 @@ function getPrintContentOrder(ticket, callback) {
     content +=  `<img src='${ticket.ticketMailInfo.storeImgUrl}' style='width: 100%;height: 100%;' />`;
     content += "</div>";
     content += "<div style=\"width: 100%;text-align: center;\">";
-    content += "关注CW大药房客服号，获取更多优惠信息"
+    content += "关注公众号，获取更多优惠信息"
     content += "</div>";
     content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
     content += "<div style=\"width: 100%;height: 50px;\"></div>";

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

@@ -159,7 +159,7 @@ var vm = new Vue({
             ],
             uniqueIdentifier: [
                 // {required: true, message: '品牌唯一简码不能为空', trigger: 'blur'},
-                {max: 10, message: '品牌唯一简码长度不能超过10', trigger: 'blur'}
+                {max: 20, message: '品牌唯一简码长度不能超过20', trigger: 'blur'}
             ],
             // listPicUrl: [
             //     {required: true, message: '品牌图片不能为空', trigger: 'blur'}
@@ -300,7 +300,7 @@ var vm = new Vue({
 
             // 校验品牌唯一简码
             var uniqueIdentifier = vm.brand.uniqueIdentifier;
-            var uniqueReg = /^[0-9a-zA-Z_]{0,10}$/;
+            var uniqueReg = /^[0-9a-zA-Z_&-]{0,20}$/;
             if(!uniqueReg.test(uniqueIdentifier)){
                 alert("请输入正确的唯一简码");
                 return;

sql/cuspay/merch_noti.sql

@@ -1,4 +1,4 @@
-create table merch_noti
+create table `kmall-haikong`.merch_noti
 (
     noti_sn                varchar(22)                           not null comment '通知编号'
         primary key,
@@ -29,7 +29,8 @@ create table merch_noti
     create_time            varchar(32)                           null comment '创建时间,yyyy-MM-dd HH:mm:ss',
     moder_sn               varchar(22)                           null comment '修改人编号',
     mod_time               varchar(32)                           null comment '修改时间,yyyy-MM-dd HH:mm:ss',
-    tstm                   timestamp   default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '时间戳'
+    tstm                   timestamp   default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '时间戳',
+    order_sn               varchar(32)                           null comment '订单号'
 )
     comment '商户通知，通知编号:支付订单号=1:n' charset = utf8;