打印需求

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

@@ -105,6 +105,7 @@ public class StoreController {
         builder.put("exprAgreementType", "第三方商户快递协议类型");
         builder.put("latitude", "纬度");
         builder.put("longitude", "经度");
+        builder.put("telephoneNumber", "门店电话");
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
@@ -134,6 +135,7 @@ public class StoreController {
         builder.put("exprAgreementType", "第三方商户快递协议类型");
         builder.put("latitude", "纬度");
         builder.put("longitude", "经度");
+        builder.put("telephoneNumber", "门店电话");
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());

kmall-admin/src/main/java/com/kmall/admin/entity/StoreEntity.java

@@ -84,6 +84,16 @@ public class StoreEntity implements Serializable {
 
     //门店二维码图片
     private String storeImgUrl;
+    //门店电话号码
+    private String telephoneNumber;
+
+    public String getTelephoneNumber() {
+        return telephoneNumber;
+    }
+
+    public void setTelephoneNumber(String telephoneNumber) {
+        this.telephoneNumber = telephoneNumber;
+    }
 
     public String getStoreImgUrl() {
         return storeImgUrl;

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

@@ -493,7 +493,8 @@ public class OrderServiceImpl implements OrderService {
         if (StringUtils.isNullOrEmpty(exprNo)) {
             throw new RRException("快递面单为空，请联系客服");
         }
-        mailInfo.setStoreImgUrl(storeEntity.getStoreImgUrl());
+        //图片地址
+        mailInfo.setStoreImgUrl(storeEntity.getStoreImgUrl()==null?"/statics/img/cw_qrcode.png":storeEntity.getStoreImgUrl().trim());
         mailInfo.setExprNo(exprNo);
         String logoUrl = "/statics/img/yto_logo.jpg";
 
@@ -507,7 +508,7 @@ public class OrderServiceImpl implements OrderService {
         mailInfo.setExprLogoUrl(logoUrl);
         byte[] barCode128 = BarcodeUtil.generateBarCode128(exprNo, 6.0D, null, true, false);
         String exprNoBase64Img = new String(Base64.getEncoder().encode(barCode128));
-        mailInfo.setShopTel("0752-2688660");
+        mailInfo.setShopTel(storeEntity.getTelephoneNumber()==null?"0752-2688660":storeEntity.getTelephoneNumber().trim());
 
         // 发货人
         mailInfo.setSenderTel("0752-2688660");
@@ -3407,6 +3408,8 @@ public class OrderServiceImpl implements OrderService {
             if (StringUtils.isNullOrEmpty(exprNo)) {
                 throw new RRException("快递面单为空，请联系客服");
             }
+            //图片地址
+            mailInfo.setStoreImgUrl(storeEntity.getStoreImgUrl()==null?"/statics/img/cw_qrcode.png":storeEntity.getStoreImgUrl().trim());
             mailInfo.setExprNo(exprNo);
             String logoUrl = "/statics/img/yto_logo.jpg";
 
@@ -3420,10 +3423,10 @@ public class OrderServiceImpl implements OrderService {
             mailInfo.setExprLogoUrl(logoUrl);
             byte[] barCode128 = BarcodeUtil.generateBarCode128(exprNo, 6.0D, null, true, false);
             String exprNoBase64Img = new String(Base64.getEncoder().encode(barCode128));
-            mailInfo.setShopTel("0752-2688660");
+            mailInfo.setShopTel(storeEntity.getTelephoneNumber()==null?"0752-2688660":storeEntity.getTelephoneNumber().trim());
 
             // 发货人
-            mailInfo.setSenderTel("0752-2688660");
+            mailInfo.setSenderTel("0752-26886602");
             mailInfo.setSenderName("CW澳洲大药房");
             mailInfo.setSenderProvince("广东省");
             mailInfo.setSenderCity("深圳市");

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

@@ -45,7 +45,7 @@
 			`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,store_img_url as storeImgUrl
+		moder_sn, mod_time, tstm,is_valid,telephone_number as telephoneNumber,store_img_url as storeImgUrl
 		from mall_store
 		where id = #{id}
 	</select>
@@ -143,7 +143,7 @@
 		s.`longitude`,
 		s.`cover_radius`,
 		s.`remark`,s.merch_sn, s.merch_name, s.creater_sn, s.create_time,s.third_party_merch_code,t.third_party_merch_name,s.expr_agreement_type,
-		s.moder_sn, s.mod_time, s.tstm,s.is_valid,s.store_img_url as storeImgUrl
+		s.moder_sn, s.mod_time, s.tstm,s.is_valid,s.telephone_number as telephoneNumber,s.store_img_url as storeImgUrl
 		from mall_store s left join third_merchant_biz t on s.third_party_merch_code = t.third_party_merch_code
 		WHERE 1=1
 		<if test="merchSn != null and merchSn.trim() != ''">
@@ -228,7 +228,8 @@
 			create_time,
 			moder_sn,
 			mod_time,
-			store_img_url
+			store_img_url,
+			telephone_number
 		)
 		values(
 			#{merchSn},
@@ -251,7 +252,9 @@
 			#{createTime},
 			#{moderSn},
 			#{modTime},
-			#{storeImgUrl}
+			#{storeImgUrl},
+			#{telephoneNumber}
+
 		)
 	</insert>
 
@@ -279,7 +282,8 @@
 			<if test="moderSn != null" >moder_sn = #{moderSn},</if>
 			<if test="modTime != null" >mod_time = #{modTime},</if>
 			<if test="tstm != null" >tstm = #{tstm},</if>
-			<if test="storeImgUrl != null" >store_img_url = #{storeImgUrl}</if>
+			<if test="storeImgUrl != null" >store_img_url = #{storeImgUrl},</if>
+			<if test="telephoneNumber != null" >telephone_number = #{telephoneNumber}</if>
 		</set>
 		where id = #{id}
 	</update>

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

@@ -109,6 +109,9 @@
             <Form-item label="备注" prop="remark">
                 <i-input type="textarea" v-model="store.remark" placeholder="备注"/>
             </Form-item>
+            <Form-item label="门店电话" prop="telephoneNumber">
+                <i-input v-model="store.telephoneNumber" placeholder="门店电话"/>
+            </Form-item>
             <Row>
                 <i-col span="16">
                     <Form-item label="门店二维码" prop="storeImgUrl">

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

@@ -1540,7 +1540,7 @@ function getPrintContentOrder(ticket) {
     // content += "网址:" + ticket.ticketFoot.url1;
     content += "</div>";
     content += "<div style=\"width: 100%;\">";
-    content += ticket.ticketFoot.welcome;
+    content += "欢迎再次惠顾 --服务电话：" + ticket.ticketMailInfo.shopTel;
     content += "</div>";
     if(ticket.cusListing.deliveryAddress.indexOf("港惠") != -1){
         content += "<div style=\"width: 100%;\">";

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

@@ -18,6 +18,7 @@ $(function () {
             {label: '经度', name: 'longitude', index: 'longitude', width: 120, align: 'right'},
             // {label: '配送半径（km）', name: 'coverRadius', index: 'cover_radius', width: 60, align: 'center'},
             {label: '备注', name: 'remark', index: 'remark', width: 80, align: 'center'},
+            {label: '门店电话', name: 'telephoneNumber', index: 'telephone_number', width: 120, align: 'center'},
             {
                 label: '门店二维码',
                 name: 'storeImgUrl',