调整

shop/src/main/java/com/zskk/shop/controller/admin/ManagerUserController.java

@@ -76,4 +76,10 @@ public class ManagerUserController extends AbstractController {
 		}
 		return new ControllerResult(userCenterService.queryUser(search));
 	}
+	
+	@RequestMapping("/getuser")
+	@ResponseBody
+	public ControllerResult getuser(){
+		return new ControllerResult(this.getUser());
+	}
 }

shop/src/main/java/com/zskk/shop/controller/web/AppointmentController.java

@@ -94,6 +94,7 @@ public class AppointmentController extends AbstractController {
 		FamilyPeople people = null;
 		if (fid.equals(0)){ //新建
 			people = new FamilyPeople();
+			people.setId(0);
 			people.setAddress("");
 			people.setBirth("");
 			people.setCtime(ToolsUtil.getNow());

shop/src/main/java/com/zskk/shop/controller/web/BuyOrderController.java

@@ -154,23 +154,22 @@ public class BuyOrderController extends AbstractController {
 		UserInfoBean userInfo	= this.getUserInfo();
 		UserBean user			= userInfo.getUser();
 		AccountBean account		= userInfo.getAccount();
-		ControllerResult result = userCenterService.createQRCode(account, user, buyOrder, goodBase, paytype);
+		String orderid			= buyOrderService.createOrderId(buyOrder, paytype);
+		buyOrderService.saveOrderId(buyOrder, orderid);
+		ControllerResult result = userCenterService.createQRCode(account, user, buyOrder, goodBase, paytype, orderid);
 		return result;
 	}
 	
 	@RequestMapping("/payed")
 	@ResponseBody
 	public ControllerResult payed(@RequestParam("apporderid") String apporderid, @RequestParam("money") String money, @RequestParam("sign") String sign ){
-		String[] arr = apporderid.split("-");
-		apporderid = arr[0];
-		
 		Map<String, String> params = new HashMap<>();
 		params.put("apporderid", 	apporderid);
 		params.put("money", 		money);
 		if (!sign.equals(userCenterService.sign(params))){
 			return new ControllerResult(ErrorConstant.SIGN_ERROR);
 		}
-		Boolean result = buyOrderService.payed(Long.parseLong(apporderid), money);
+		Boolean result = buyOrderService.payed(apporderid, money);
 		if (result){
 			return new ControllerResult(result);
 		}else{

shop/src/main/java/com/zskk/shop/dao/BuyOrderMapper.java

@@ -31,4 +31,6 @@ public interface BuyOrderMapper {
 	List<BuyOrderItem> queryItems(Long bid);
 	BuyOrderItem queryItem(Long id);
 	void addItems(@Param("items") List<BuyOrderItem> items);
+	public int setOrderid(BuyOrder order);
+	public BuyOrder queryByOrderid(String orderid);
 }

shop/src/main/java/com/zskk/shop/dao/entry/BuyOrder.java

@@ -19,6 +19,7 @@ public class BuyOrder {
 	private Integer payStatus;
 	private Integer isDel;
 	private Integer appointmentNum;
+	private String orderid;
 	private Integer ctime;
 	private Integer ptime;
 	public Long getId() {
@@ -81,4 +82,10 @@ public class BuyOrder {
 	public void setAppointmentNum(Integer appointmentNum) {
 		this.appointmentNum = appointmentNum;
 	}
+	public String getOrderid() {
+		return orderid;
+	}
+	public void setOrderid(String orderid) {
+		this.orderid = orderid;
+	}
 }

shop/src/main/java/com/zskk/shop/service/BuyOrderService.java

@@ -157,15 +157,15 @@ public class BuyOrderService {
 	 * 支付完成回调
 	 * @param bid
 	 */
-	public Boolean payed(Long bid, String money){
-		BuyOrder buyOrder = buyOrderMapper.queryBuyOrder(bid);
+	public Boolean payed(String orderid, String money){
+		BuyOrder buyOrder = buyOrderMapper.queryByOrderid(orderid);
 		if (buyOrder != null && buyOrder.getTotalPrice().compareTo(new BigDecimal(money)) == 0){
 			buyOrder.setPayStatus(PAY_STATUS_PAYED);
 			buyOrder.setPtime(ToolsUtil.getNow());
 			buyOrderMapper.updateBuyOrder(buyOrder);
 			return Boolean.TRUE;
 		}else{
-			LogUtil.error("支付回调 返回一个不存在的订单号:" + bid, null);
+			LogUtil.error("支付回调 返回一个不存在的订单号:" + orderid, null);
 			return Boolean.FALSE;
 		}
 	}
@@ -199,6 +199,27 @@ public class BuyOrderService {
 		return buyOrderMapper.setBuyOrderAppointmentNum(buyOrder.getId(), buyOrder.getAppointmentNum(), oldNum);
 	}
 	
+	/**
+	 * 获取订单ID
+	 * @param buyOrder
+	 * @param payType
+	 * @return
+	 */
+	public String createOrderId(BuyOrder buyOrder, Integer payType){
+		return buyOrder.getId() + "_" + payType;
+	}
+	
+	/**
+	 * 保存订单ID
+	 * @param buyOrder
+	 * @param orderid
+	 * @return
+	 */
+	public Integer saveOrderId(BuyOrder buyOrder, String orderid){
+		buyOrder.setOrderid(orderid);
+		return buyOrderMapper.setOrderid(buyOrder);
+	}
+	
 	/**
 	 * 对象转换
 	 * @param buyOrder

shop/src/main/java/com/zskk/shop/service/FamilyPeopleService.java

@@ -141,7 +141,7 @@ public class FamilyPeopleService {
 		
 		//维护家人 
 		if (people.getId().equals(0)){
-			addMyPeople(userBean.getUserid(), people.getName(), people.getPhone(), people.getIdcard(), people.getSex());
+			people = addMyPeople(userBean.getUserid(), people.getName(), people.getPhone(), people.getIdcard(), people.getSex());
 		}else{
 			updateMyPeople(userBean.getUserid(), people.getId(), people.getName(), people.getPhone(), people.getIdcard(), people.getSex());
 		}

shop/src/main/java/com/zskk/shop/service/UserCenterService.java

@@ -48,11 +48,11 @@ public class UserCenterService {
 	@Autowired
 	private SignService signService;
 	
-	public ControllerResult createQRCode(AccountBean account, UserBean user, BuyOrder order, GoodBase good, Integer paytype){
+	public ControllerResult createQRCode(AccountBean account, UserBean user, BuyOrder order, GoodBase good, Integer paytype, String orderid){
 		Map<String, String> params = new HashMap<>();
 		params.put("accountid", account.getAccountid());
 		params.put("companyid", companyid);
-		params.put("apporderid", order.getId() + "_" + paytype);
+		params.put("apporderid", orderid);
 		params.put("payType", paytype.toString());
 		params.put("payment", "1");
 		params.put("customer", user.getUserid());

shop/src/main/resource/mapper/BuyOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.zskk.shop.dao.BuyOrderMapper">
 	<sql id="selectBuyOrder">
 		id, uid, uphone, uname, total_price as totalPrice, pay_status as payStatus, 
-		is_del as isDel, appointment_num as appointmentNum, ctime, ptime
+		is_del as isDel, appointment_num as appointmentNum, orderid, ctime, ptime
 	</sql>
 	<select id="queryMyBuyOrders" resultType="com.zskk.shop.dao.entry.BuyOrder">
 		select <include refid="selectBuyOrder"></include>	
@@ -66,4 +66,13 @@
 			(#{item.bid}, #{item.gid}, #{item.num}, #{item.price}, #{item.totalPrice}, #{item.ctime})			
 		</foreach>
 	</insert>
+	
+	<update id="setOrderid" parameterType="com.zskk.shop.dao.entry.BuyOrder">
+		update buy_order set orderid=#{orderid} where id=#{id};
+	</update>
+	<select id="queryByOrderid" resultType="com.zskk.shop.dao.entry.BuyOrder">
+		select <include refid="selectBuyOrder"></include>
+		from buy_order
+		where orderid=#{orderid}
+	</select>
 </mapper>

shop/static/manager/src/api/index.js

@@ -80,4 +80,5 @@ export default {
     bindPackage: (params, vue) => post(`${serverPath}manage/bindPackage`, params, vue),
     setGoodLabels: (params, vue) => post(`${serverPath}manage/setGoodLabels`, params, vue),
     setRecommand: (params, vue) => post(`${serverPath}manage/setRecommand`, params, vue),
+    getuser: (params, vue) => post(`${serverPath}/manage/muser/getuser`, params, vue),
 }

shop/static/manager/src/components/Header.vue

@@ -4,8 +4,7 @@
         <div class="user-info">
             <el-dropdown trigger="click" @command="handleCommand">
                 <span class="el-dropdown-link">
-                    <img class="user-logo" :src="icon">
-                    {{username}}
+                     {{username}}
                 </span>
                 <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="loginout">退出</el-dropdown-item>
@@ -15,70 +14,71 @@
     </div>
 </template>
 <script>
-    import {LOGIN_USER, getStorage, removeStorage} from '../util'
     export default {
         data() {
             return {
-            }
-        },
-        computed:{
-            username(){
-                let user = getStorage(LOGIN_USER);
-                return user.name;
-            },
-            icon(){
-                let user = getStorage(LOGIN_USER);
-                return user.icon
+                username:'',
+                icon:''
             }
         },
         methods:{
+            getuser:function(){
+                this.$http.getuser({}, this).then(res=>{
+                    if (res.code ===0 ){
+                        this.username = res.obj.name
+                        this.icon = res.obj.idcard
+                    }
+                });
+            },
             handleCommand(command) {
                 if(command == 'loginout'){
-                    removeStorage(LOGIN_USER)
-                    this.$router.push('/');
+                    
                 }
             }
+        },
+        mounted: function(){
+            this.getuser()
         }
     }
 </script>
 <style scoped>
-    .header {
-        position: relative;
-        box-sizing: border-box;
-        width: 100%;
-        height: 70px;
-        font-size: 22px;
-        line-height: 70px;
-        color: #fff;
-    }
-    .header .logo{
-        float: left;
-        width:250px;
-        text-align: center;
-    }
-    .user-info {
-        float: right;
-        padding-right: 50px;
-        font-size: 16px;
-        color: #fff;
-    }
-    .user-info .el-dropdown-link{
-        position: relative;
-        display: inline-block;
-        padding-left: 50px;
-        color: #fff;
-        cursor: pointer;
-        vertical-align: middle;
-    }
-    .user-info .user-logo{
-        position: absolute;
-        left:0;
-        top:15px;
-        width:40px;
-        height:40px;
-        border-radius: 50%;
-    }
-    .el-dropdown-menu__item{
-        text-align: center;
-    }
+.header {
+  position: relative;
+  box-sizing: border-box;
+  width: 100%;
+  height: 70px;
+  font-size: 22px;
+  line-height: 70px;
+  color: #fff;
+}
+.header .logo {
+  float: left;
+  width: 250px;
+  text-align: center;
+}
+.user-info {
+  float: right;
+  padding-right: 50px;
+  font-size: 16px;
+  color: #fff;
+}
+.user-info .el-dropdown-link {
+  position: relative;
+  display: inline-block;
+  padding-left: 50px;
+  color: #fff;
+  cursor: pointer;
+  vertical-align: middle;
+}
+.user-info .user-logo {
+  position: absolute;
+  left: 0;
+  top: 15px;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+}
+.el-dropdown-menu__item {
+  text-align: center;
+}
 </style>

shop/static/manager/src/components/page/EditGoodsDescribe.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-upload :action="uploadAction" list-type="picture-card" :file-list="items" :on-success="onUploadSuccess" :before-upload="onBeforeUpload">
+        <el-upload :action="uploadAction" list-type="picture-card" :file-list="items" :on-success="onUploadSuccess" :before-upload="onBeforeUpload" :on-remove="onRemove">
             <i class="el-icon-plus"></i>
         </el-upload>
         <div>
@@ -39,6 +39,9 @@ export default {
         this.items.push({ name: '', url: res.obj })
       }
     },
+    onRemove: function(file, fileList){
+      this.items = fileList;
+    },
     save: function() {
       var items = []
       this.items.forEach(it => {