|
@@ -4,6 +4,8 @@ import com.caimei.entity.CmOperationUser;
|
|
|
import com.caimei.entity.WxJsonModel;
|
|
|
import com.caimei.service.order.OrderService;
|
|
|
import com.caimei.utils.SessionHelper;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -18,6 +20,8 @@ import java.util.Map;
|
|
|
@Controller
|
|
|
@RequestMapping("/order")
|
|
|
public class OrderController {
|
|
|
+ protected static final Logger logger = LoggerFactory.getLogger(OrderController.class);
|
|
|
+
|
|
|
@Autowired
|
|
|
private OrderService orderService;
|
|
|
|
|
@@ -56,20 +60,40 @@ public class OrderController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 提交订单
|
|
|
+ * 提交订单接口
|
|
|
*
|
|
|
- * @return
|
|
|
+ * @Param params参数格式:
|
|
|
+ * 参数1userId用户ID
|
|
|
+ * 参数2=organizeID组织ID,
|
|
|
+ * 参数3=cartType购买类型(1购物车提交,2直接购买提交)
|
|
|
+ * 参数4=ddressID订单收货地址
|
|
|
+ * 参数5=orderInfo订单信息参数格式:
|
|
|
+ * [
|
|
|
+ * {"shopId":1001,
|
|
|
+ * "note":81,
|
|
|
+ * "productInfo":[{"productId":1,"productNum":80},{"productId":2,"productNum":100}]
|
|
|
+ * }
|
|
|
+ *]
|
|
|
+ *参数6=balanceDeductionFlag是否使用余额抵扣(1使用,2使用)
|
|
|
+ *参数7=orderShouldPayFee订单应付金额(商品总金额 - 余额抵扣 - 经理折扣默认为0)
|
|
|
+ * @return code:1000=用户账户异常,1001=
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequestMapping("/submitOrder")
|
|
|
- public WxJsonModel submitOrder(Integer organizeID,HttpServletRequest request) {
|
|
|
+ public WxJsonModel submitOrder(String params,HttpServletRequest request) {
|
|
|
WxJsonModel wxJsonModel = WxJsonModel.newInstance();
|
|
|
+ logger.info(">>>>>>订单信息params:"+params);
|
|
|
//检查用户是否登入
|
|
|
CmOperationUser currentUser = SessionHelper.getCurrentUser(request);
|
|
|
if(null == currentUser){
|
|
|
- wxJsonModel.error("1000","用户账户异常");
|
|
|
+ return wxJsonModel.error("1000","用户账户异常");
|
|
|
}
|
|
|
- //保存商品
|
|
|
+ //校验传入参数的正确性
|
|
|
+
|
|
|
+
|
|
|
+ //获取用户最新余额,判断是否存在
|
|
|
+
|
|
|
+ //提交订单完成后清理购物车(用户ID,商品ID)
|
|
|
|
|
|
return wxJsonModel.success();
|
|
|
}
|