java/zhihuishenqu.git

			@@ -31,7 +31,7 @@
			@Slf4j
			@RestController
			@RequestMapping("/shopFlower/")
			@Api(tags = {"商城服务"})
			@Api(tags = {"花城商城服务"})
			public class ShopFlowerApi extends BaseController {

			@Resource

			@@ -249,7 +249,7 @@
			continue;
			}

			if (goodsAttrDO.getSale() < createGoodsDTO.getNum()) {
			if (goodsAttrDO.getStock() < createGoodsDTO.getNum()) {
			return R.fail("该规格库存不足，无法下单");
			}
			orderGoodsDO.setGoodsAttrId(goodsAttrDO.getId());

			@@ -60,7 +60,7 @@
			</select>

			<select id="pageOrderBy" resultType="com.panzhihua.common.model.vos.shop.ComShopOrderSearchVO">
			SELECT distinct sr.id, sr.store_id, sr.user_id, su.phone AS userName , sr.order_no, sr.pay_no,
			SELECT sr.id, sr.store_id, sr.user_id, su.phone AS userName , sr.order_no, sr.pay_no,
			sr.wx_tarde_no, sr.status, sr.pay_status, sr.receiver_id,
			sr.total_amount, sr.discount_amount, sr.pay_amount, sr.pay_type,
			sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company,
			@@ -108,7 +108,7 @@
			AND ss.id = #{pageComShopOrderSearchDTO.storeId}
			</if>
			<if test='pageComShopOrderSearchDTO.storeUserId != null '>
			AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId}
			AND ss.user_id = #{pageComShopOrderSearchDTO.storeUserId}
			</if>
			<if test='pageComShopOrderSearchDTO.deliveryType != null '>
			AND sr.delivery_type = #{pageComShopOrderSearchDTO.deliveryType}

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史