Merge remote-tracking branch 'upsteam/master'

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/OrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.impl;
 
 import cn.hutool.core.lang.UUID;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -2790,7 +2791,9 @@ public class OrderServiceImpl implements OrderService {
         HaiKongSendOrderInfoRecordEntity haiKongSendOrderInfoRecordEntity = wrapSendOrderInfoRecord(sendOrderToVmcShopDTO);
         List<HaiKongSendOrderInfoDetailRecordEntity> detailRecordEntities = wrapSendOrderInfoDetailRecord(orderInfoItemDTOList);
 
-        String body = JacksonUtil.toJson(sendOrderToVmcShopDTO);
+        // 不要用自带的工具类，处理XML字符串时有bug
+        cn.hutool.json.JSON json = JSONUtil.parse(sendOrderToVmcShopDTO);
+        String body = JSONUtil.toJsonPrettyStr(json);
 
         String orderSn = order.getOrder_sn();
         try {
@@ -3085,7 +3088,11 @@ public class OrderServiceImpl implements OrderService {
         orderWXPayRecordService.updateRecord(orderWXPayRecordCurrent.getId(), wechatMicropayApiResult);
 
         order.setRequest(payOriginInfoDTO.getRequest());
-        order.setResponse(payOriginInfoDTO.getResponse());
+        String response = payOriginInfoDTO.getResponse();
+        if (!org.springframework.util.StringUtils.isEmpty(response)) {
+            response = response.replaceAll("\r|\n", "");
+        }
+        order.setResponse(response);
         order.setPayApp("wxpay");
         order.setFeeType(wechatMicropayApiResult.getFee_type());
         order.setAliTradeNo(wechatMicropayApiResult.getTransaction_id());
@@ -3597,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);
             }
@@ -5241,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/haikong/haikongmemberordersyncresend.js

@@ -4,19 +4,19 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '海控会员系统会员唯一标识open_id', name: 'openId', index: 'open_id', width: 100},
-			{label: '会员手机号', name: 'phone', index: 'phone', width: 100},
+			{label: 'open_id', name: 'openId', index: 'open_id', align: 'center', width: 160},
+			{label: '会员手机号', name: 'phone', index: 'phone', align: 'center', width: 100},
 			{
-				label: '消费时间', name: 'consumeDate', index: 'consume_date', width: 100,
+				label: '消费时间', name: 'consumeDate', index: 'consume_date', align: 'center', width: 140,
 				formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss')
 				}
 			},
-			{label: '订单金额', name: 'orderAmount', index: 'order_amount', width: 100},
-			{label: '订单编号', name: 'orderNo', index: 'order_no', width: 100},
-			{label: '订单抵扣积分数量', name: 'orderScore', index: 'order_score', width: 100},
-			{label: '会员系统订单id', name: 'memberSysOrderId', index: 'member_sys_order_id', width: 100},
-			{label: '重发状态', name: 'resendStatus', index: 'resend_status', width: 100,
+			{label: '订单金额', name: 'orderAmount', index: 'order_amount', align: 'center', width: 80},
+			{label: '订单编号', name: 'orderNo', index: 'order_no', align: 'center', width: 200},
+			{label: '订单抵扣积分数量', name: 'orderScore', index: 'order_score', align: 'center', width: 120},
+			{label: '会员系统订单id', name: 'memberSysOrderId', index: 'member_sys_order_id', align: 'center', width: 120},
+			{label: '重发状态', name: 'resendStatus', index: 'resend_status', align: 'center', width: 100,
 				formatter: function (value) {
 					if (value == '0') {
 						return '等待重发';
@@ -29,7 +29,7 @@ $(function () {
 					}
 				}
 			},
-			{label: '最后一次重发时间', name: 'lastResendTime', index: 'last_resend_time', width: 100,
+			{label: '最后一次重发时间', name: 'lastResendTime', index: 'last_resend_time', align: 'center', width: 140,
 				formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss')
 				}

kmall-admin/src/main/webapp/js/haikong/haikongmemberscorechangedetailrecord.js

@@ -4,15 +4,15 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn', width: 100},
-			{label: '条码', name: 'productBarcode', index: 'product_barcode', width: 100},
-			{label: 'sku', name: 'sku', index: 'sku', width: 100},
-			{label: '零售价', name: 'retailPrice', index: 'retail_price', width: 100},
-			{label: '实际支付价', name: 'actualPrice', index: 'actual_price', width: 100},
-			{label: '销售数', name: 'sellVolume', index: 'sell_volume', width: 100},
-			{label: '分摊抵扣积分', name: 'deductionScore', index: 'deduction_score', width: 100},
-			{label: '赠送积分', name: 'giftScore', index: 'gift_score', width: 100},
-			{label: '生成规则', name: 'generateRules', index: 'generate_rules', width: 100,
+			{label: '订单编号', name: 'orderSn', index: 'order_sn', align: 'center', width: 200},
+			{label: '条码', name: 'productBarcode', index: 'product_barcode', align: 'center', width: 120},
+			{label: 'sku', name: 'sku', index: 'sku', align: 'center', width: 120},
+			{label: '零售价', name: 'retailPrice', index: 'retail_price', align: 'center', width: 100},
+			{label: '实际支付价', name: 'actualPrice', index: 'actual_price', align: 'center', width: 100},
+			{label: '销售数', name: 'sellVolume', index: 'sell_volume', align: 'center', width: 100},
+			{label: '分摊抵扣积分', name: 'deductionScore', index: 'deduction_score', align: 'center', width: 100},
+			{label: '赠送积分', name: 'giftScore', index: 'gift_score', align: 'center', width: 100},
+			{label: '生成规则', name: 'generateRules', index: 'generate_rules', align: 'center', width: 100,
 				formatter: function (value) {
 					if (value == '0') {
 						return '门店';
@@ -25,7 +25,7 @@ $(function () {
 					}
 				}
 			},
-			{label: '生成规则比例', name: 'generateRatio', index: 'generate_ratio', width: 100}
+			{label: '生成规则比例', name: 'generateRatio', index: 'generate_ratio', align: 'center', width: 100}
 			],
 		viewrecords: true,
         height: 550,

kmall-admin/src/main/webapp/js/haikong/haikongmemberscorechangerecord.js

@@ -4,14 +4,14 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: 'openid', name: 'openId', index: 'open_id', width: 100},
-			{label: '会员积分', name: 'score', index: 'score', width: 100},
-			{label: '订单号', name: 'outBizNo', index: 'out_biz_no', width: 100},
-			{label: '积分变动描述', name: 'changeReason', index: 'change_reason', width: 100},
-			{label: '积分变动事件', name: 'changeEvent', index: 'change_event', width: 100},
-			{label: '自定义积分变动唯一标识', name: 'changeId', index: 'change_id', width: 100},
-			{label: '积分变动流水id', name: 'statementId', index: 'statement_id', width: 100},
-			{label: '重发状态', name: 'resendStatus', index: 'resend_status', width: 100,
+			{label: 'openid', name: 'openId', index: 'open_id', align: 'center', width: 140},
+			{label: '会员积分', name: 'score', index: 'score', align: 'center', width: 100},
+			{label: '订单号', name: 'outBizNo', index: 'out_biz_no', align: 'center', width: 200},
+			{label: '积分变动描述', name: 'changeReason', index: 'change_reason', align: 'center', width: 100},
+			{label: '积分变动事件', name: 'changeEvent', index: 'change_event', align: 'center', width: 100},
+			{label: '自定义积分变动唯一标识', name: 'changeId', index: 'change_id', align: 'center', width: 280},
+			{label: '积分变动流水id', name: 'statementId', index: 'statement_id', align: 'center', width: 180},
+			{label: '重发状态', name: 'resendStatus', index: 'resend_status', align: 'center', width: 100,
 				formatter: function (value) {
 					if (value == '0') {
 						return '等待重发';

kmall-admin/src/main/webapp/js/haikong/haikongsendorderinfodetailrecord.js

@@ -4,18 +4,18 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '订单id', name: 'orderId', index: 'order_id', width: 80},
-			{label: '图片地址', name: 'imageUrl', index: 'image_url', width: 80},
-			{label: '明细商品货号', name: 'bn', index: 'bn', width: 80},
-			{label: '条码', name: 'barcode', index: 'barcode', width: 80},
-			{label: '商品名', name: 'name', index: 'name', width: 80},
-			{label: '明细商品的成本', name: 'cost', index: 'cost', width: 80},
-			{label: '销售价', name: 'price', index: 'price', width: 80},
-			{label: '商品编码', name: 'itemcode', index: 'itemcode', width: 80},
-			{label: '明细商品总额', name: 'amount', index: 'amount', width: 80},
-			{label: '明细商品购买数量', name: 'nums', index: 'nums', width: 80},
-			{label: '是否含税', name: 'isTax', index: 'is_tax', width: 80},
-			{label: '税金', name: 'taxPrice', index: 'tax_price', width: 80}],
+			{label: '订单id', name: 'orderId', index: 'order_id', align: 'center', width: 200},
+			{label: '图片地址', name: 'imageUrl', index: 'image_url', align: 'center', width: 120},
+			{label: '明细商品货号', name: 'bn', index: 'bn', align: 'center', width: 120},
+			{label: '条码', name: 'barcode', index: 'barcode', align: 'center', width: 120},
+			{label: '商品名', name: 'name', index: 'name', align: 'center', width: 240},
+			{label: '明细商品的成本', name: 'cost', index: 'cost', align: 'center', width: 120},
+			{label: '销售价', name: 'price', index: 'price', align: 'center', width: 80},
+			{label: '商品编码', name: 'itemcode', index: 'itemcode', align: 'center', width: 120},
+			{label: '明细商品总额', name: 'amount', index: 'amount', align: 'center', width: 100},
+			{label: '明细商品购买数量', name: 'nums', index: 'nums', align: 'center', width: 100},
+			{label: '是否含税', name: 'isTax', index: 'is_tax', align: 'center', width: 80},
+			{label: '税金', name: 'taxPrice', index: 'tax_price', align: 'center', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

kmall-admin/src/main/webapp/js/haikong/haikongsendorderinforecord.js

@@ -4,24 +4,24 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '订单编号', name: 'outerOrderNo', index: 'outer_order_no', width: 80},
-			{label: '支付方式', name: 'payApp', index: 'pay_app', width: 80},
-			{label: '配送方式', name: 'dlytypeCode', index: 'dlytype_code', width: 80},
-			{label: '收货人', name: 'consigneeName', index: 'consignee_name', width: 80},
-			{label: '收货地址省份', name: 'consigneeAreaProvince', index: 'consignee_area_province', width: 80},
-			{label: '收货地址城市', name: 'consigneeAreaCity', index: 'consignee_area_city', width: 80},
-			{label: '收货地址地区', name: 'consigneeAreaCounty', index: 'consignee_area_county', width: 80},
-			{label: '收货地址详细地址', name: 'consigneeAddress', index: 'consignee_address', width: 80},
-			{label: '收货人的邮编', name: 'consigneeZip', index: 'consignee_zip', width: 80},
-			{label: '收货人的联系电话', name: 'consigneeTel', index: 'consignee_tel', width: 80},
-			{label: '收货人的邮箱', name: 'consigneeEmail', index: 'consignee_email', width: 80},
-			{label: '收货人的手机号', name: 'consigneeMobile', index: 'consignee_mobile', width: 80},
-			{label: '订单商品总重量（克）', name: 'weight', index: 'weight', width: 80},
-			{label: '订单包含商品数量', name: 'quantity', index: 'quantity', width: 80},
-			{label: '订单应付总金额', name: 'orderTotal', index: 'order_total', width: 80},
-			{label: '下单的平台', name: 'platform', index: 'platform', width: 80},
-			{label: '支付货币金额', name: 'money', index: 'money', width: 80},
-			{label: '付款方式', name: 'payMode', index: 'pay_mode', width: 80,
+			{label: '订单编号', name: 'outerOrderNo', index: 'outer_order_no', align: 'center', width: 200},
+			{label: '支付方式', name: 'payApp', index: 'pay_app', align: 'center', width: 80},
+			{label: '配送方式', name: 'dlytypeCode', index: 'dlytype_code', align: 'center', width: 80},
+			{label: '收货人', name: 'consigneeName', index: 'consignee_name', align: 'center', width: 60},
+			{label: '收货省份', name: 'consigneeAreaProvince', index: 'consignee_area_province', align: 'center', width: 80},
+			{label: '收货城市', name: 'consigneeAreaCity', index: 'consignee_area_city', align: 'center', width: 80},
+			{label: '收货地区', name: 'consigneeAreaCounty', index: 'consignee_area_county', align: 'center', width: 80},
+			{label: '收货详细地址', name: 'consigneeAddress', index: 'consignee_address', align: 'center', width: 200},
+			{label: '收货人邮编', name: 'consigneeZip', index: 'consignee_zip', align: 'center', width: 80},
+			{label: '收货人电话', name: 'consigneeTel', index: 'consignee_tel', align: 'center', width: 100},
+			{label: '收货人邮箱', name: 'consigneeEmail', index: 'consignee_email', align: 'center', width: 120},
+			{label: '收货人手机', name: 'consigneeMobile', index: 'consignee_mobile', align: 'center', width: 100},
+			{label: '商品总重量', name: 'weight', index: 'weight', align: 'center', width: 80},
+			{label: '商品数量', name: 'quantity', index: 'quantity', align: 'center', width: 80},
+			{label: '应付金额', name: 'orderTotal', index: 'order_total', align: 'center', width: 80},
+			{label: '下单的平台', name: 'platform', index: 'platform', align: 'center', width: 80},
+			{label: '支付金额', name: 'money', index: 'money', align: 'center', width: 80},
+			{label: '付款方式', name: 'payMode', index: 'pay_mode', align: 'center', width: 80,
 				formatter: function (value) {
 					if (value == 'online') {
 						return '在线支付';
@@ -32,11 +32,17 @@ $(function () {
 					}
 				}
 			},
-			{label: '发送给支付企业的原始请求', name: 'request', index: 'request', width: 80},
-			{label: '支付成功后回调的原始请求', name: 'response', index: 'response', width: 80},
-			{label: '支付平台流水号', name: 'outTradeNo', index: 'out_trade_no', width: 80},
-			{label: '口岸代码', name: 'seaportCode', index: 'seaport_code', width: 80},
-			{label: '跨境商品平台来源', name: 'seaportPlatform', index: 'seaport_platform', width: 80,
+			{label: '发送支付原始请求', name: 'request', index: 'request', align: 'center', width: 100},
+			{label: '支付回调原始响应', name: 'response', index: 'response', align: 'left', width: 100,
+				formatter: function (value) {
+					value = value.replace(/</g, '&lt;');
+					value = value.replace(/>/g, '&gt;');
+					return value;
+				}
+			},
+			{label: '支付平台流水号', name: 'outTradeNo', index: 'out_trade_no', align: 'center', width: 180},
+			{label: '口岸代码', name: 'seaportCode', index: 'seaport_code', align: 'center', width: 70},
+			{label: '跨境商品平台来源', name: 'seaportPlatform', index: 'seaport_platform', align: 'center', width: 120,
 				formatter: function (value) {
 					if (value == '1') {
 						return '广州跨境通保税';
@@ -45,11 +51,11 @@ $(function () {
 					}
 				}
 			},
-			{label: '订购人身份证号码', name: 'identityCard', index: 'identity_card', width: 80},
-			{label: '订购人姓名', name: 'identityName', index: 'identity_name', width: 80},
-			{label: '订购人手机号', name: 'identityMobile', index: 'identity_mobile', width: 80},
-			{label: '订单产品信息', name: 'orderProductInfo', index: 'order_product_info', width: 80},
-			{label: '重发状态', name: 'resendStatus', index: 'resend_status', width: 80,
+			{label: '订购人身份证号码', name: 'identityCard', index: 'identity_card', align: 'center', width: 160},
+			{label: '订购人姓名', name: 'identityName', index: 'identity_name', align: 'center', width: 80},
+			{label: '订购人手机号', name: 'identityMobile', index: 'identity_mobile', align: 'center', width: 100},
+			{label: '订单产品信息', name: 'orderProductInfo', index: 'order_product_info', align: 'center', width: 100},
+			{label: '重发状态', name: 'resendStatus', index: 'resend_status', align: 'center', width: 80,
 				formatter: function (value) {
 					if (value == '0') {
 						return '等待重发';
@@ -86,7 +92,7 @@ $(function () {
         gridComplete: function () {
 
         }
-    });
+	});
 });
 
 let vm = new Vue({

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>";

sql/init/sys_table.sql

@@ -676,8 +676,101 @@ INSERT INTO `sys_menu` VALUES (906, 904, '修改', NULL, 'mall2pointsrules:updat
 INSERT INTO `sys_menu` VALUES (907, 904, '删除', NULL, 'mall2pointsrules:delete', 2, NULL, 0, 0);
 INSERT INTO `sys_menu` VALUES (908, 394, '新增', NULL, 'address:save', 2, NULL, 0, 0);
 INSERT INTO `sys_menu` VALUES (909, 394, '修改', NULL, 'address:update', 2, NULL, 0, 0);
-INSERT INTO `sys_menu` VALUES (915, 1, '接口日志', 'shop/interfacesendlog.html', 'fa fa-eye', 1, 'fa fa-file-text-o', 0, 0);
+INSERT INTO `sys_menu` VALUES (915, 942, '接口日志', 'shop/interfacesendlog.html', 'fa fa-eye', 1, 'fa fa-file-text-o', 0, 0);
 INSERT INTO `sys_menu` VALUES (916, 915, '查询', NULL, 'tinterfacesendlog:info,interfacesendlog:list', 2, NULL, 0, 0);
+INSERT INTO `sys_menu` VALUES (942, 0, '日志记录', NULL, NULL, 0, 'fa fa-file-text-o', 10, 0);
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    VALUES ('942', '会员同步消费订单记录', 'shop/haikongmemberordersyncresend.html', NULL, '1', 'fa fa-file-code-o', '6', '0');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '查看', null, 'haikongmemberordersyncresend:list,haikongmemberordersyncresend:info', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '新增', null, 'haikongmemberordersyncresend:save', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '修改', null, 'haikongmemberordersyncresend:update', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '删除', null, 'haikongmemberordersyncresend:delete', '2', null, '6', '0';
+
+
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    VALUES ('942', '会员积分变动记录详情表', 'shop/haikongmemberscorechangedetailrecord.html', NULL, '1', 'fa fa-file-code-o', '6', '0');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '查看', null, 'haikongmemberscorechangedetailrecord:list,haikongmemberscorechangedetailrecord:info', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '新增', null, 'haikongmemberscorechangedetailrecord:save', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '修改', null, 'haikongmemberscorechangedetailrecord:update', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '删除', null, 'haikongmemberscorechangedetailrecord:delete', '2', null, '6', '0';
+
+
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    VALUES ('942', '推送订单信息记录', 'shop/haikongsendorderinforecord.html', NULL, '1', 'fa fa-file-code-o', '6', '0');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '查看', null, 'haikongsendorderinforecord:list,haikongsendorderinforecord:info', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '新增', null, 'haikongsendorderinforecord:save', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '修改', null, 'haikongsendorderinforecord:update', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '删除', null, 'haikongsendorderinforecord:delete', '2', null, '6', '0';
+
+
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    VALUES ('942', '会员积分变动记录表', 'shop/haikongmemberscorechangerecord.html', NULL, '1', 'fa fa-file-code-o', '6', '0');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '查看', null, 'haikongmemberscorechangerecord:list,haikongmemberscorechangerecord:info', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '新增', null, 'haikongmemberscorechangerecord:save', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '修改', null, 'haikongmemberscorechangerecord:update', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '删除', null, 'haikongmemberscorechangerecord:delete', '2', null, '6', '0';
+
+
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    VALUES ('942', '推送订单明细记录', 'shop/haikongsendorderinfodetailrecord.html', NULL, '1', 'fa fa-file-code-o', '6', '0');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '查看', null, 'haikongsendorderinfodetailrecord:list,haikongsendorderinfodetailrecord:info', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '新增', null, 'haikongsendorderinfodetailrecord:save', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '修改', null, 'haikongsendorderinfodetailrecord:update', '2', null, '6', '0';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `status`)
+    SELECT @parentId, '删除', null, 'haikongsendorderinfodetailrecord:delete', '2', null, '6', '0';
+
+
+
+
 
 -- ----------------------------
 -- Table structure for sys_notice