Merge branch 'sit-Leung' into sit-jiamin-v2

rc-busness/ajax/getData.js

@@ -81,10 +81,11 @@ export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,pr
  * 删除购物车
  */
 export const deleteCart = ( productCode) => {
+	debugger;
   var data = {
-    productCode:productCode
+    productCode
   }
-  return fetch('cancelCartProductInfo',data,'POST')
+  return fetch('cancelCartProductInfo',productCode,'POST')
 }
 /**
  * 购物车批量提交
@@ -187,16 +188,14 @@ export const userquery = (stype, ) => {
   return fetch('goods?petType='+stype, data, 'POST' )
 }
 //处方信息
-export const userque = (stype, curPage,curRow) => {
+export const userque = (goodsName, curPage,curRow) => {
 	if(!curPage)
 		curPage=1;
 	if(!curRow)
 		curRow=10;
   let queryTail='page='+curPage+'&rows='+curRow;
-  if(stype)
+  if(goodsName)
-	queryTail = '?stype='+queryTail+'&'+queryTail;
+	queryTail = '?goodsName='+goodsName;
-  else
-	queryTail = '?'+queryTail;
   var data = {
   }
   return fetch('goods'+queryTail, data, 'POST' )

rc-busness/components/address.vue

@@ -88,13 +88,13 @@ export default {
           message: "手机号码输入有误",
         });
         return;
-      } else if (this.alladdress === "") {
+      } else if (!this.alladdress || this.alladdress === "") {
         this.$message({
           type: "warning",
           message: "请输入详细地址",
         });
         return;
-      } else if (this.userpeople === "") {
+      } else if (!this.userpeople || this.userpeople === "") {
         this.$message({
           type: "warning",
           message: "请输入姓名",

rc-busness/components/addressInput.vue

@@ -169,7 +169,7 @@ export default {
 						break;
 					case 1:
 						//Checking City
-						if(obj.id.indexOf(provinceId)<0)
+						if(obj.id.toString().indexOf(provinceId)<0)
 						{
 							console.log('500 : error via checking validatePickedValues');
 							_self.returnValueArr.splice(index,1);
@@ -183,7 +183,7 @@ export default {
 						break;
 					case 2:
 						//Checking Area
-						if(areaId && obj.id.indexOf(areaId)<0)
+						if(areaId && obj.id.toString().indexOf(areaId)<0)
 						{
 							console.log('501 : error via checking validatePickedValues');
 							_self.returnValueArr.splice(index,1);
@@ -226,7 +226,7 @@ export default {
 			stringStartWith=stringStartWith+"-";
 			let result=[];
 			dataColArea.forEach(function(ele){
-				if(ele.id.indexOf(stringStartWith)===0)
+				if(ele.id.toString().indexOf(stringStartWith)===0)
 				{
 					result.push(ele);
 				}
@@ -462,6 +462,9 @@ export default {
 			padding-bottom:.25rem;
 			background:url("../assets/image/ico-location.png") no-repeat 98% center;
 			background-size:16px;
+			position:relative;
+			top:.5rem;
+			padding-left:.875rem;
 		}
 		.ts-area-picker-mobile{
 			display:flex;
@@ -485,7 +488,7 @@ export default {
 			display:none;
 		}
 		.ts-area-picker-container,.ts-area-picker-value-displayer{
-			width:42.5rem;
+			width:42.25rem;
 		}
 		.ts-area-picker-value-displayer{
 			padding-left:1rem;

rc-busness/components/header.vue

@@ -44,7 +44,7 @@
 			
 			<a class="rc-xl-up rc-btn rc-btn--icon rc-icon ts-login--xs rc-iconography rc-interactive" aria-label="login" @click="turnlogin">
 				<span class="rc-screen-reader-text">
-					登录
+					个人中心
 				</span>
 				 <em class="rc-screen-reader" v-show="loginornot"></em>
 			</a>
@@ -306,7 +306,7 @@
 					<li class="rc-list__item">
 					  <a class="rc-list__link rc-icon ts-login--xs rc-iconography--xs" role="menuitem" href="javascript:void();" @click="turnlogin">
 					  	个人中心
-						<em class="rc-screen-reader"></em>
+						<em class="rc-screen-reader" v-if="loginornot"></em>
 					  </a>
 					</li>
 	              <li class="rc-list__item">
@@ -362,9 +362,9 @@ export default {
 	let usernot=this.$store.state.userInfo;
 	//console.log(usernot);
 	if(usernot){
-		this.loginornot=true
-	}else{
 		this.loginornot=false
+	}else{
+		this.loginornot=true
 		this.usermessage=usernot;
 	}
 	if(isInitialized)
@@ -402,13 +402,15 @@ export default {
 	},
      //判断有无登录跳转不同页面
 	turnlogin(){
-        if(this.usermessage==null||this.usermessage==undefined){
+		let userInfo = this.$store.state.userInfo;
-			this.$router.push({ name: "userlogin-login",
+        if(!userInfo){
-			params:{id:12,key:'222'}
+			this.$router.push({
+				name: "userlogin-login",
+				params:{}
 			})
 		}else{
-			this.$router.push({ name: "personal-mypersonal",
+			this.$router.push({ 
-					
+				name: "personal-mypersonal",
 			})
 		}
 	}

rc-busness/components/tabs.vue

@@ -1,12 +1,11 @@
 <template>
  <div class="crumbs" v-if="showTab">
 	<el-breadcrumb separator-class="el-icon-arrow-right">
-  <el-breadcrumb-item :to=item.path   v-for="(item, index) in titleLists"
+		<el-breadcrumb-item to="/" >{{ this.homepageName }}</el-breadcrumb-item>
-        :key="index">{{ item.meta.title }}</el-breadcrumb-item>
-  <!-- <el-breadcrumb-item>商品管理</el-breadcrumb-item>
-  <el-breadcrumb-item>商品分类</el-breadcrumb-item> -->
-</el-breadcrumb>
 		
+		<el-breadcrumb-item :to=item.path   v-for="(item, index) in crumbs"
+		:key="index">{{ item.title }}</el-breadcrumb-item>
+	</el-breadcrumb>
   </div>
 </template>
 
@@ -14,93 +13,25 @@
 import { mapState, mapMutations } from "vuex";
 
 export default {
+	props:["crumbs"],
+	name:"crumbs",
     data() {
 		return {
-      title: "",
+			homepageName:'首页'
-      path: "",
-      titleLists: [
-       {
-             path: '/',
-    name: 'index',
-    meta:{
-      title: '首页',
- 
-    }
-       }
-
-      ],
-      showTab: true,
-      isShow: true,
 		};
 	},
-
+	created(){
-
+		if(this.showTab != false)
-    watch: {
+			this.showTab=true;
-    $route() {
-      this.setTitle();
 	},
+	watch: {
 	},
 	mounted() {
-    this.setTitle(); 
 	},
 
 	methods: {
-    ...mapMutations(["changemessage",'selectMenu']),
+		...mapMutations(["changemessage",'selectMenu'])
-       setTitle() {
-              console.log(this.$route.matched);
-              console.log(this.titleLists);
-                    let userinfo=[]
-   
-
- let saveUserInfo={
-    path:'admin',
-   name:'1',
-   meta:'b341181c-aced-11e9-89bf-00163e0e8daf',
-
 	}
-   userinfo.push(this.$route.matched);
-   let list=[];
-   console.log(userinfo);
-   userinfo.map(item=>{
-      console.log(item);
-      list=item;
-   })
- console.log(list);
- let anlist={
-    path:'admin',
-   name:'1',
-   meta:'b341181c-aced-11e9-89bf-00163e0e8daf',
- }
-   list.forEach(element=>{
-     console.log(element);
-     anlist=element
-   })
-                 for(let i in list){
-                   saveUserInfo.path=list[i].path;
-                      saveUserInfo.name=list[i].name;
-                      saveUserInfo.meta=list[i].meta;
-                   }
-                        console.log(saveUserInfo);
-                // store.commit('se', current.name);
-               this.selectMenu({ data: saveUserInfo });
-      console.log(this.$store.state.tabsList);
-      this.titleLists=this.$store.state.tabsList;
-      // console.log(userlisa);
-      console.log(this.titleLists);
-    },
-  },
-  // created(){
-  //  let user=this.$store.state.tabsList;
-  //    this.tags=user;
-  //    console.log(this.tags);
-  //   console.log(user);
-  //    console.log(this.$store.state.tabsList)
-  // },
-  
-  // mounted(){
- 
-  // }
-
 };
 </script>
 

rc-busness/pages/index.vue

@@ -1468,9 +1468,9 @@
 			this.dataLoaded=false;
 			let data=[];
 			if(stype==undefined||stype==null){
-				data = await biaomessage(0,'',1,6);
+				data = await biaomessage(0,'',1,12);
 			}else{
-				data = await biaomessage(this.userserachlist,'',1,6);
+				data = await biaomessage(this.userserachlist,'',1,12);
 			}
 			if(data){
 				let userlist=[];
@@ -1546,12 +1546,14 @@
 		},
 
 		//请求处方量信息数据
-		async userchufang() {
+		async userchufang(item) {
+			if(!item)
+				item = this.discounchufang[0].title;
 			this.dataLoaded=false;
 			let list=[];
-			let data = await userque();
+			let data = await userque(item,1,8);
 			if(data){
-				list=data.slice(0,6);
+				list=data.slice(0,8);
 				this.processinformation=list;
 				this.chufanlist=data;
 				this.dataLoaded=true;
@@ -1560,15 +1562,17 @@
         //点击请求处方量标签信息数据
 		async userquery(item) {
 			this.dataLoaded=false;
+			let list=[];
 			let data = await userquery(item);
 			if(data){
-				this.processinformation=data;
+				list=data.slice(0,8);
+				this.processinformation=list;
 				this.dataLoaded=true;
 			}
 		}, 
 		//处方用粮筛选
 		userclick(item,index){
-		   this.userquery(index)
+		   this.userchufang(index)
 		},
          //全价猫干粮筛选
 		catclickGan(){

rc-busness/pages/personal/settlement.less

@@ -155,8 +155,6 @@ ul li ol li em strong i {
 
                 span {
                     display: block;
-                    margin-left: 3px;
-
                 }
 
                 i {

rc-busness/pages/personal/settlement.vue

@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <div class="rc_contline">1</div>
+    <div class="rc_contline"></div>
     <div class="rc-main" v-for="(item, index) in goldmedal" :key="index">
       <div class="rc-usermain">
         <div class="rc-image">

rc-busness/pages/productdetails/producted.vue

@@ -135,7 +135,7 @@
                     <i class="ts-row-title">商品规格：</i>
                   </div>
 					<div class="ts-tag-list">
-						<em v-for="(item, index) in newlist" :key="index"  @click="selectsearch(item, index)" :class="[activeIndexa==index?'active':'unactive',item.leftAllotment?'':'disabled']">
+						<em v-for="(item, index) in newlist" :key="index"  @click="selectsearch(item, index)" :class="[activeIndexa==index?'active':'unactive',item.leftAllotment>0?'':'disabled']">
 							{{ item.specifications }}
 						</em>
 					</div>
@@ -218,7 +218,7 @@
           <img :src="userimage" alt="" />
           <div class="rc-contair">
             <div class="rc-left">
-              <div>
+              <div v-if="item.couponAmount">
                 <i>￥</i><span>{{ item.couponAmount }}</span>
               </div>
             </div>
@@ -313,14 +313,14 @@ export default {
 				let data = await goodsmessage(singleCode);
 				if (data && data.data.length>0) {
 					newlist.push(data.data[0]);
-					if(data.data[0].leftAllotment && !stopLeftAllotmentChecking) {
+					if(data.data[0].leftAllotment>0 && !stopLeftAllotmentChecking) {
 						activeIndexa = stopIndex;
 						curItem = data.data[0];
 						stopLeftAllotmentChecking=true;
 					}
-				}
 					stopIndex++;
 				}
+			}
 			productAttachmentList = newlist[0].productAttachmentList;
 			userbuy = true;
 		}
@@ -452,10 +452,13 @@ export default {
     //获取用户领取的优惠券
     async getconf(memberId, couponId) {
       let data = await getConfig(memberId, couponId);
+	  let msg = '领取成功';
       if (data) {
+		if(data.code!='0')
+			msg = data.msg;
 		this.$message({
 			type: "warning",
-          message: data.msg,
+			message: msg,
 		});
       }
     },
@@ -535,7 +538,14 @@ export default {
     },
 
     plus(num, index) {
+		if(this.sales_num >= this.curItem.leftAllotment) {
+			this.$message({
+				type: "warning",
+				message: '已达到本品最大购买上限',
+			});
+		} else {
 			this.sales_num = parseInt(this.sales_num) + 1;
+		}
     },
     // 数量减方法
     sub(num, index) {
@@ -551,7 +561,7 @@ export default {
       // let mobile=JSON.parse(location.getItem('userInfo'));
       // console.log(userid,mobile);
       let data = await postCourseId(
-        this.productCode,
+        item.productCode,
         this.sales_num,
         this.usermessage.data.id,
         this.usermessage.data.mobile,
@@ -614,7 +624,7 @@ export default {
       }
     },
     selectsearch(item, index) {
-		if(!item.leftAllotment)
+		if(!item.leftAllotment || item.leftAllotment<=0)
 			return;
       this.activeIndexa = index;
 	  this.curItem = item;

rc-busness/pages/productdetails/productlist.vue

@@ -2,6 +2,7 @@
   <div>
     <Myheader></Myheader>
     <div class="rc-top"></div>
+	<tabs :crumbs="crumbs"></tabs>
     <div class="rc-max-width--xl rc-main">
       <div class="usersearch">
         <div class="usercontentshow" ref="usercontent">
@@ -310,6 +311,7 @@
 import Myheader from "~/components/header.vue";
 import MyFooter from '~/components/rc-footer.vue'
 import FixRight from "~/components/fixed-right.vue";
+import tabs from "~/components/tabs.vue";
 import {
   userstype,
   biaome,
@@ -320,6 +322,12 @@ import {
 export default {
   data() {
     return {
+		crumbs:[
+			{
+				path:'/productdetails/productlist/',
+				title:'产品列表',
+			}
+		],
 		value: "",
 		isLoading: false,
 		userstype: [],
@@ -343,6 +351,7 @@ export default {
       activeIndexd: "-1",
       activeIndexe: "-1",
       activeIndexf: "-1",
+	  inRxGoods:false,
       isadrond: true,
       isshow: false,
       openshow: false,
@@ -476,7 +485,8 @@ export default {
   components: {
     Myheader,
     MyFooter,
-	FixRight
+	FixRight,
+	tabs
   },
   created() {
 	  this.routeParams=this.$route.query;
@@ -527,7 +537,7 @@ export default {
 					}
 				}
 			}
-			data = await searchchanpin(searchCriteria, usertype, 1, 12);
+			data = await searchchanpin(searchCriteria, usertype, 1, 120);
 		}
 		if (data) {
 			this.rccontair = data;
@@ -698,9 +708,12 @@ export default {
 					tmp.checked=true;
 				}
 			});
+			this.inRxGoods=true;
 		}
-		else
+		else {
 			this.prefecture[this.rxGoodsIndexPointer].checked=false;
+			this.inRxGoods=false;
+		}
 	},
 	resetAllOptions(){
 		let _self = this;
@@ -736,7 +749,7 @@ export default {
     	let isRxGoods=false;
     	let productCode = [];
     	let mainProductCode = item.productCode;
-    	if(!item.ecPrice && !item.price)
+    	if(this.inRxGoods)
     	{
     		isRxGoods=1;
     		productCode = [item.productCode];

rc-busness/pages/usersearch/search.vue

@@ -104,6 +104,7 @@
     <div class="rc-max-width--xl rc-margin-bottom--lg">
       <div class="usersearch">
         <div class="rc-contair">
+		<div class="ts-no-data" v-if="!rccontair.length">暂未发现相关记录</div>
           <ul class="ts-product-list">
             <li
               v-for="(item, index) in rccontair"
@@ -362,6 +363,7 @@ export default {
       activeIndexd: "-1",
       activeIndexe: "-1",
       activeIndexf: "-1",
+	  inRxGoods:false,
       isadrond: true,
       isshow: false,
       openshow: false,
@@ -589,7 +591,7 @@ export default {
 					}
 				}
 			}
-			data = await searchchanpin(searchCriteria, usertype, 1, 12);
+			data = await searchchanpin(searchCriteria, usertype, 1, 120);
 		}
 		if (data) {
 			this.rccontair = data;
@@ -705,9 +707,12 @@ export default {
 					tmp.checked=true;
 				}
 			});
+			this.inRxGoods=true;
 		}
-		else
+		else {
 			this.prefecture[this.rxGoodsIndexPointer].checked=false;
+			this.inRxGoods=false;
+		}
 	},
 	resetAllOptions(){
 		let _self = this;

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java

@@ -48,6 +48,7 @@ public class OrderController {
     @Autowired
     private CartService cartService;
 
+
     @ApiOperation(value = "微信支付订单", notes = "生成订单")
     @PostMapping("royalcanin/generateOrderWX")
     public ResponseDTO<String> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception {
@@ -57,6 +58,7 @@ public class OrderController {
         String mobile = "";
         int buyCount = 0;
         double total_fee = 0 ;
+        double basePoint = 0 ;
         WxPayEntity wxPayEntity = new WxPayEntity();
         JSONArray orderDatilListJson = new JSONArray();
         OrdersEntity ordersEntity = new OrdersEntity();
@@ -79,6 +81,7 @@ public class OrderController {
             }else{
                 total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ;
             }
+            basePoint = basePoint + ordersEntitys.getBasePoint();
             orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
             orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName());
             orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo());
@@ -100,6 +103,7 @@ public class OrderController {
         ordersEntity.setBuyCount(buyCount);
         ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
         ordersEntity.setOrderStatus("0");
+        ordersEntity.setBasePoint(basePoint);
 
         if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){
             wxPayEntity.setProduct_id(ordersEntity.getProductCode());

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/CartEntity.java

@@ -25,4 +25,6 @@ public class CartEntity {
 
     private String mobile;
 
+    private int leftAllotment;
+
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java

@@ -41,5 +41,5 @@ public class OrderEntity {
 
     private String payType="1";
 
-
+    private String basePoint;
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java

@@ -41,4 +41,6 @@ public class OrdersEntity {
 
     private  OrderAddress orderAddress;
 
+    private Double basePoint;
+
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountChangeEntity.java

@@ -21,17 +21,17 @@ public class MemberAccountChangeEntity {
     /**
      * 会员ID
      */
-    private int memberId;
+    private String memberId;
 
     /**
      * 积分变更类型
      */
-    private int changeTypeId;
+    private String changeTypeId;
 
     /**
      * 积分增加/减少数量
      */
-    private BigDecimal changeValue;
+    private String changeValue;
 
     /**
      * 积分明细

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java

@@ -1,10 +1,11 @@
 package net.lab1024.smartadmin.module.system.wxpay;
 
-import net.lab1024.smartadmin.module.system.royalcanin.domain.RoyalcaninOperateLogService;
+import net.lab1024.smartadmin.module.system.royalcanin.MemberAccountService;
+import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
+import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.notify.model.NotifyEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyService;
-import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPay;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayUtil;
@@ -40,6 +41,12 @@ public class WxpayService {
     private NotifyService notifyService;
 
 
+    @Autowired
+    private MemberAccountService memberAccountService;
+
+
+
+
     public String generateQRCode(WxPayEntity wxPayEntity) throws Exception {
         WXPay wxpay = new WXPay(config);
         InetAddress ip4 = Inet4Address.getLocalHost();
@@ -86,6 +93,13 @@ public class WxpayService {
                 if ("SUCCESS".equals(sortedMap.get("result_code"))) {
                     String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
                     String totalFee = sortedMap.get("total_fee"); // 交易金额
+                    OrderEntity orderEntity = orderService.findByOrderId(outTradeNo);
+                    MemberAccountChangeEntity memberAccountChangeEntity = new MemberAccountChangeEntity();
+                    memberAccountChangeEntity.setChangeTypeId("1");
+                    memberAccountChangeEntity.setChangeValue(orderEntity.getBasePoint());
+                    memberAccountChangeEntity.setMemberId(orderEntity.getMemberId());
+                    memberAccountService.memberAccountChange(memberAccountChangeEntity);
+
 
                     NotifyEntity notifyEntity = new NotifyEntity();
                     notifyEntity.setAppId(sortedMap.get("appid"));

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java

@@ -78,7 +78,8 @@ public class SmartJWTUtil {
     }
 
     public static void main(String[] args) {
-        String token =  SmartJWTUtil.generateToken("844350");
+        String token =  SmartJWTUtil.generateToken("884234");
+        System.out.println(token);
         System.out.println(SmartJWTUtil.decodeToken(token));
     }
 

smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql

@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `t_department` (
 DELETE FROM `t_department`;
 /*!40000 ALTER TABLE `t_department` DISABLE KEYS */;
 INSERT INTO `t_department` (`id`, `name`, `short_name`, `manager_id`, `parent_id`, `sort`, `update_time`, `create_time`) VALUES
-	(1, '1024创新实验室', 'ZWGWL', 16, 0, 1, '2019-04-03 10:41:25', '2019-04-03 10:41:25'),
+	(1, '实验室', 'ZWGWL', 16, 0, 1, '2019-04-03 10:41:25', '2019-04-03 10:41:25'),
 	(2, '二级部门-2', NULL, 15, 1, 17, '2019-04-15 16:45:10', '2019-04-15 16:45:10'),
 	(4, '二级部门-1', '管理', 14, 1, 20, '2019-04-17 16:14:55', '2019-04-17 16:14:55'),
 	(8, '三级部门-1', NULL, NULL, 4, 8, '2019-04-25 12:25:52', '2019-04-25 12:25:52'),
@@ -213,7 +213,7 @@ CREATE TABLE IF NOT EXISTS `t_file` (
 DELETE FROM `t_file`;
 /*!40000 ALTER TABLE `t_file` DISABLE KEYS */;
 INSERT INTO `t_file` (`id`, `module_id`, `module_type`, `file_name`, `file_size`, `file_type`, `file_path`, `file_location_type`, `creater_user`, `update_time`, `create_time`) VALUES
-	(1, '1', '1', '阿里云1.jpg', NULL, NULL, 'backUser/config/d1788b717be24f14ba526f25397b936f', 2, 1, NULL, '2019-07-05 10:38:15'),
+	(1, '1', '1', '阿里.jpg', NULL, NULL, 'backUser/config/d1788b717be24f14ba526f25397b936f', 2, 1, NULL, '2019-07-05 10:38:15'),
 	(2, '2', '1', '1.jpg', NULL, NULL, 'backUser/config/8895ec770c4e4e558c6d9b54eb00dffc', 2, 1, '2019-07-18 09:20:59', '2019-07-18 09:20:25'),
 	(3, '3', '1', '随笔.txt', NULL, NULL, 'backUser/config/f5cbc4c9a56f4fa7ad0ba58b0aa5d169', 2, 1, NULL, '2019-07-18 09:22:47'),
 	(4, '3', '1', '1.jpg', NULL, NULL, 'backUser/config/2019071809245603e0a4e449a4bf3aa28ee731c309040.jpg', 1, 1, NULL, '2019-07-18 09:24:51'),
@@ -328,7 +328,7 @@ INSERT INTO `t_notice` (`id`, `title`, `content`, `deleted`, `send_status`, `cre
 	(95, '4444444', '444444444444', 1, 1, 1, '2019-07-13 17:54:53', '2019-09-04 09:42:02'),
 	(96, '3434', '444444', 1, 1, 1, '2019-07-13 17:58:42', '2019-11-08 09:05:24'),
 	(97, '44444', '555555555555', 1, 1, 1, '2019-07-13 17:58:54', '2019-09-03 16:19:50'),
-	(98, '《青花瓷》', '素胚勾勒出青花笔锋浓转淡\n瓶身描绘的牡丹一如你初妆\n冉冉檀香透过窗心事我了然\n周杰伦 青花瓷\n周杰伦 青花瓷\n宣纸上走笔至此搁一半\n釉色渲染仕女图韵味被私藏\n而你嫣然的一笑如含苞待放\n你的美一缕飘散\n去到我去不了的地方\n天青色等烟雨 而我在等你\n炊烟袅袅升起 隔江千万里\n在瓶底书刻隶仿前朝的飘逸\n就当我为遇见你伏笔\n天青色等烟雨 而我在等你\n月色被打捞起 晕开了结局\n如传世的青花瓷自顾自美丽\n你眼带笑意\n色白花青的锦鲤跃然于碗底\n临摹宋体落款时却惦记着你\n你隐藏在窑烧里千年的秘密\n极细腻犹如绣花针落地\n篱外芭蕉惹骤雨门环惹铜绿\n而我路过那江南小镇惹了你\n在泼墨山水画里\n你从墨色深处被隐去\n天青色等烟雨 而我在等你\n炊烟袅袅升起 隔江千万里\n在瓶底书刻隶仿前朝的飘逸\n就当我为遇见你伏笔\n天青色等烟雨 而我在等你\n月色被打捞起 晕开了结局\n如传世的青花瓷自顾自美丽\n你眼带笑意\n天青色等烟雨 而我在等你\n炊烟袅袅升起 隔江千万里\n在瓶底书刻隶仿前朝的飘逸\n就当我为遇见你伏笔\n天青色等烟雨 而我在等你\n月色被打捞起 晕开了结局\n如传世的青花瓷自顾自美丽\n你眼带笑意 ', 1, 1, 1, '2019-08-05 16:36:44', '2019-09-02 17:53:12'),
+	(98, '《青花瓷》', '你眼带笑意 ', 1, 1, 1, '2019-08-05 16:36:44', '2019-09-02 17:53:12'),
 	(99, '1', '2', 1, 1, 30, '2019-08-08 14:53:58', '2019-08-08 14:54:07'),
 	(100, '呵呵', '呵呵', 1, 1, 1, '2019-08-20 16:52:53', '2019-09-02 17:46:59'),
 	(101, 'aa', 'bbcc', 1, 1, 30, '2019-08-23 09:51:01', '2019-08-23 09:51:28'),
@@ -1604,29 +1604,6 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_operate_log` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-
-
-CREATE TABLE `t_good_user` (
-`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户Id',
-`username` varchar(128) DEFAULT NULL COMMENT '用户名',
-`sex` varchar(20) DEFAULT NULL COMMENT '性别',
-PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 COMMENT='产品用户表';
-
-CREATE TABLE `t_good_flow` (
-`id` int(11) NOT NULL AUTO_INCREMENT,
-`flow_no` varchar(32) DEFAULT NULL COMMENT '流水号',
-`order_no` varchar(20) DEFAULT NULL COMMENT '订单号',
-`product_id` varchar(20) DEFAULT NULL COMMENT '产品主键ID',
-`pay_amount` varchar(11) DEFAULT NULL COMMENT '支付金额',
-`pay_type` int(11) DEFAULT NULL COMMENT '支付方式\r\n 1：支付宝\r\n 2：微信',
-`buy_count` int(11) DEFAULT NULL COMMENT '购买个数',
-`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='产品流水表';
 
 CREATE TABLE `t_good_orders` (
 `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -1643,6 +1620,7 @@ CREATE TABLE `t_good_orders` (
 `member_id` varchar(20) DEFAULT NULL COMMENT '用户member',
 `phone_number` varchar(20) DEFAULT NULL COMMENT '用户手机',
 `buy_count` int(11) DEFAULT NULL COMMENT '产品购买的个数',
+`base_point` int(11) DEFAULT NULL COMMENT '产品积分',
 `pay_type` int(11) DEFAULT NULL COMMENT '支付方式 1：支付宝 2：微信',
 `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '订单创建时间',
 `pay_time` datetime DEFAULT NULL COMMENT '支付时间',
@@ -1677,6 +1655,7 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_cart` (
   `product_img` varchar(5000) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `specifications` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `buy_count` int(20) DEFAULT NULL,
+  `left_allotment` int(20) DEFAULT NULL,
   `member_id` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `mobile` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,